Use a merge tool for all merges in Git

published Jun 27, 2013 02:21 by admin ( last modified Jun 27, 2013 02:21 )

A couple of days ago Git decided to automatically merge two branches through, among other things, switching method names between two method bodies (in python). The aggregate result was a mess.

For smaller projects there will not be massive changesets. Is there a way to tell Git to always use a merge tool, even the ones not deemed as a conflict by Git? There seems to be an answer on StackOverflow, define your own configuration version of kdiff3 with the --qall flag set. As I understand the tool always get the option to merge. Untested by me as of yet.

if you really want to disable any automatic resolving, just add --qall to the kdiff3 command line above. But then you have to manually resolve all changes in the file manually, even the ones that did not result in a git conflict.