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

2016-08-04 Thread Guilherme Cavalcanti
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] Overriding the "git merge" command

2016-08-04 Thread Konstantin Khomoutov
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

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

2016-08-04 Thread Guilherme Cavalcanti
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