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 if is that possible to set the *git merge* command to call
the external merge tool directly, in any situation, not only when there are
More specifically, as far as I know, the workflow is:
1. call "git merge"
2. if there is conflict, call "git mergetool" to invoke an external
What I want is:
1. call "git merge" to invoke an external merge tool
Is that possible? If so, how?
Thanks in advance.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.