[git-users] Problem with two copies of same branch diverging

I posted this to the git mailing list, but it's a beginner question, so I think it's better posted here. Hi, Thanks for reading my question. I have two copies of code checked out at the same branch. Desktop and remote server. I use an IDE that automatically SFTP transfers each save from the

[git-users] Overriding the "git merge" command

Hello, I am a PhD candidate researching about merge tools and doing experiments with git and github. I know that when the *git merge* command fails in presence of conflicts, it is possible to invoke external merge tools through the command* git mergetool* to resolve conflicts. I was wondering i

Re: [git-users] Overriding the "git merge" command

On Thu, 4 Aug 2016 08:33:57 -0700 (PDT) Guilherme Cavalcanti wrote: > I am a PhD candidate researching about merge tools and doing > experiments with git and github. > I know that when the *git merge* command fails in presence of > conflicts, it is possible to invoke external merge tools through

Re: [git-users] Overriding the "git merge" command

Nice. Many thanks. I'll give it a try and inform here.. Em quinta-feira, 4 de agosto de 2016 13:15:57 UTC-3, Konstantin Khomoutov escreveu: > > On Thu, 4 Aug 2016 08:33:57 -0700 (PDT) > Guilherme Cavalcanti > wrote: > > > I am a PhD candidate researching about merge tools and doing > > experim

Re: [git-users] Problem with two copies of same branch diverging

Hello, I would either stash or commit. Stashing essentially puts away your non-committed changes to a safe storage. You do a git pull, making the server up to date. When it is done, just pop your stash. You can also go with committing. Just git add everything, commit with a random message. Then