git – Como iniciar novos projetos sendo uma completa iniciante no GitHub?

Eu sou atualmente uma estudante em dois Bootcamps na Digital Innovation One: Sendo que atualmente estou estudando o Bootcamp Backend Carrefour e o outro é o Desenvolvedor Node.js. Eu não faço ideia de como iniciar um projeto mesmo que eu tenha iniciado já no Bootcamp e estou no módulo de Criando um repositório para seus projetos inovadores.Por onde eu poderia começar nessa jornada ….

git – Existe um meio de apagar comentários de um commit do github?

Existe algum meio de apagar o comentário de um commit? Ou existe um arquivo invisível que salva esses comentários e registros?(seja nos arquivos do pc ou no do repositório no site).

Pode ser apagar todos ou um a um.

Tenho um repositorio importante no github que tem alguns comentários errados e preciso tira-los, pesquisei e vi que tem como retornar commits, mas ai iria apagar as alterações.

Ja tentei clonar meu próprio repositorio e upar de novo e ele vem com os comentários.

dependencies – Is there a convenient way to include only a particular snapshot of a git repository inside another project?

I might be going about this in an unorthodox way and that’s why I’d like to get some input on alternative ideas.

I have created a Java Promise library, that is in ongoing development. I’ve included this library into an Android app that I am currently developing as well. At this point only my Promise library is version controlled with Git.

I only develop for myself, locally, so there’s no worries about other people’s commits or remote repositories.

Here’s the basic local structure:

  • /Library/Promise/.git
  • /App/MyApp/

Right now, when I want do some work on the Promise library, by checking out, say, the “develop” branch, this change is immediately reflected in MyApp’s code as well. I’d like to prevent this from happening. I’d like to only include a version of my Promise library that I am currently happy with.

For instance, only include:

  • the master branch
  • a tagged commit
  • etc.

Is there a convenient way to only include a snapshot of the library’s Git code, without having to make a copy of the library? Or is it typically not custom to directly include a Git repository into another project, like this?

Preferably, I’d like to stay away from advanced dependency repositories, like Maven and what have you, for now, as that’s a bit too much much hassle for me, at the moment. I’m hoping there are some less involved alternatives for this conundrum.

xargs and git issues in windows powershell

I’ve been using the following command to delete any merged git branches:

git branch --merged | grep -v "*" | grep -v "master" | grep -v "staging" | xargs -n 1 git branch -d

grep and xargs both being packaged with git for windows. Recently moved computers and decided to switch to powershell (from windows cmd) adn this no longer works as expected. Instead of deleting the branch I get (note the question mark at the end):

error: branch '<branch-name>?' not found.

The strange thing as that changing the command to the following prints without questionmarks:
git branch --merged | grep -v "*" | grep -v "master" | grep -v "staging" | xargs -n 1 echo

and manually deleting the branch using git branch -d also works without an issue. I’m curious where the question mark is coming from and how to get rid of it.

Release git flow – Stack Overflow en español

Al utilizar git-flow y finalizar un release me pone el release con un tag de la siguiente forma.

The release was tagged '0.0.11.0.0'

La primera parte que dide 0.0.1 no la puse yo en ningun momento dentro de mi proyecto pero la segunda parte que es la que yo quiero agregar le agrega esa primera parte del tag.

Solamente use los comandos git flow release start 1.0.0 y para finalizarlo use git flow release finish 1.0.0.

version control – How do you achieve a numeric versioning scheme with Git?

Jon Purdy has the right idea. git flow makes the actual management of these branches easy, as well, and branch management is an argument for moving to git.

Let’s start with a basic rundown of git, since you’re coming from the svn-to-git perspective. Consider in git the following:

master--...............-.....-..............-
                     /     /              /
         ---develop---------............../
                                        /
                             --feature---

Above, you branch master to develop (denoted by the ), and branch develop to a feature branch. We merge those branches back up (denoted by /), with commits (-) along a branch. (If there’s no commit but the merge is way to the right, there are . indicators to show that the next - is the next commit).

Easy enough. What if we have a hotfix in our main release?

master--...............-.....-................-...........-.........-
                     /     /                /          /|        /
                    /     /                /   -hotfix-- V       /
          ---develop---------............../..............-...----
                                         /              V   /
                              --feature---   --feature2...----

Above, develop branched from master. The bug discovered in master was fixed by branching from master, fixing it, and merging back into master. We then merged master into develop, and then develop into feature2, which rolled the new code from hotfix into these branches.

When you merge feature2 back to develop, its history includes develop with the hotfix. Likewise, develop is merged into feature2 with the new code from master, so merging develop back to master will happen without a hitch, as it’s based on that commit in master at that time—as if you had branched from master at that point.

So here’s another way to do that.

master--..........-........-
                /       /
         ---1.0--  --1.1-- 

Your 1.0 releases get tagged—1.0.1, 1.0.2, 1.0.3, and so forth.

Now here’s a trick: you found a bug in 1.0 and it affects 1.1, 1.2, and 1.3. What do you do?

You branch off your latest or earliest maintained release and fix it. Then you merge your new hotfix branch into 1.3—and into 1.2, 1.1, and 1.0. Don’t branch from each of the maintenance version branches; don’t merge 1.0 into master or merge master back into 1.0. Take the one hotfix branch and merge it into all your version branches. If there are conflicts, it will tell you; review your code to ensure the changes are correct (git diff is your friend).

Now that specific change is applied everywhere. The lineage is branched, but it’s okay. It’s not haphazard. Tag the 1.3 head as 1.3.17, merge it into every feature-in-progress branched from 1.3, and move on.

The git flow extension helps manage these maintenance, feature, and hotfix branches for you. Once you get the workflow down, this is trivial and takes a huge amount of trouble out of source code management.

I’ve seen this done on programming teams, but I’ve not worked that deeply as a programmer myself, so I’m still getting my head around the day-to-day workflow myself.

development – How to upload a git downloaded folder (containing html, js, css) and run it in sharepoint online?

I have a git downloaded folder structure with multiple html,css,js images and media file .
Is there a way to run all these all together or do i need to change html into .aspx and upload all reference files in sharepoint and refere accordingly ?
We dont have spfx BTW

http – Git clone fail silently

I’m trying to use my Odroid U3 under Debian 10 for making a Pihole server.

When i try to clone something thru HTTP protocol i got this :

root@odroid-jessie:/tmp# ls -al
total 11508
drwxrwxrwt  9 root root     4096 Jun 15 21:22 .
drwxr-xr-x 21 root root     4096 Jan  1  2000 ..
-rw-r--r--  1 root root   116023 Jun 15 21:03 basic-install.sh
drwxrwxrwt  2 root root     4096 Feb 14  2019 .font-unix
-rw-r--r--  1 root root   577916 Apr 23 23:51 git-all_2.1.4-2.1+deb8u10_all.deb
drwxr-xr-x 29 root root    36864 Jun 15 20:54 git-master
drwxrwxrwt  2 root root     4096 Feb 14  2019 .ICE-unix
-rw-r--r--  1 root root 11006737 Jun 15 20:40 master.zip
drwx------  3 root root     4096 Feb 14  2019 systemd-private-c86b125d69494ea387f2ba79a436ebc4-ntp.service-PJTcDj
drwxrwxrwt  2 root root     4096 Feb 14  2019 .Test-unix
drwxrwxrwt  2 root root     4096 Feb 14  2019 .X11-unix
drwxrwxrwt  2 root root     4096 Feb 14  2019 .XIM-unix
root@odroid-jessie:/tmp# git clone https://github.com/pi-hole/pi-hole.git
Cloning into 'pi-hole'...
root@odroid-jessie:/tmp# ls -al
total 11508
drwxrwxrwt  9 root root     4096 Jun 15 21:22 .
drwxr-xr-x 21 root root     4096 Jan  1  2000 ..
-rw-r--r--  1 root root   116023 Jun 15 21:03 basic-install.sh
drwxrwxrwt  2 root root     4096 Feb 14  2019 .font-unix
-rw-r--r--  1 root root   577916 Apr 23 23:51 git-all_2.1.4-2.1+deb8u10_all.deb
drwxr-xr-x 29 root root    36864 Jun 15 20:54 git-master
drwxrwxrwt  2 root root     4096 Feb 14  2019 .ICE-unix
-rw-r--r--  1 root root 11006737 Jun 15 20:40 master.zip
drwx------  3 root root     4096 Feb 14  2019 systemd-private-c86b125d69494ea387f2ba79a436ebc4-ntp.service-PJTcDj
drwxrwxrwt  2 root root     4096 Feb 14  2019 .Test-unix
drwxrwxrwt  2 root root     4096 Feb 14  2019 .X11-unix
drwxrwxrwt  2 root root     4096 Feb 14  2019 .XIM-unix

So after that I’ve decided to make a strace on this because git say “cloning into pi-hole” but does nothing.

Here is the output : PASTEBIN

I cannot understand why did it fail, but ssh clone work.

Oh, here is the git version (it’s compiled from sources) :

root@odroid-jessie:/tmp# git --version
git version 2.20.1

Can someone give me some help ?

Git push to trigger Windows server git pull

I’ve been using Git for a little while and I am working on a solution for our database administrators to have their script repository automatically distributed to their Windows database servers from our internal Git server. I’m wondering if there is an agent or listener that can be installed on Windows that can listen for a webhook from the Git server that will initiate a git pull on the database server?

This is simmilar to what I want to do but I am not hosting a web server to create such a PHP listener. Automatically Trigger Git Pull For Website On Github Push

Thanks in advance!

How to reduce the merge-redundancy due to testing in our Git workflow?

We have are a small team of 6 people working with Scrum and Git.

We have adapted the “Git workflow” by Vincent Driessen from:

https://nvie.com/posts/a-successful-git-branching-model/

This results in the following diagram, showing our model:

Git workflow

When we develop a new feature, we branch off of the “develop”-branch.

After a feature has been completed, we do 2 stages of testing – internally (the developers) and externally (the customers that suggested the feature).

For the customer-test, we have a “sandbox”, which is more or less a 1:1 copy of our live-system.

It has it’s own branch “sandbox” and is sort of a “pre-release”.

Our problem:

We have 1 person doing the merges from the feature-branch into the sandbox-branch, including solving all merge-conflicts.

(We know this is not scalable and soon every developer might need to merge + conflict-solve their own feature-branches. We are still learning and adapting)

Then the customer goes into the sandbox, tests the feature and says either “fail” or “success”.

1) Fail – we fix the feature.

2) Success – we close the feature and merge it into develop.

And this is where we are not sure if this process is optimal – you basically need to merge + conflict-solve at least twice, because while testing on the sandbox, the develop-branch keeps getting new commits, which often can result in the feature-/sandbox-version being different from the develop-verson -> merge-conflicts.

Is there a way to solve this more elegantly?

And / Or is there a way to reduce the merge-conflicts?