We've been getting really annoying merge conflicts that aren't logically merge conflicts but git can't resolve them of itself. $ git merge origin/master merge conflicts src/data/record.type2.dat src/data/record.type3.dat src/data/localization.strings.dat $ where it would be quite reasonable to make a merge tool that merged localization.strings.dat only if it could also edit record.*.dat as well. However, if it picked up the result of an automatic merge of record.*.dat it just won't work as it no longer has enough information to do the merge. The approach is specific to the structure of these dat files, and would not be generally applicable.
