Re: How to automatically correct an almost correct auto-merge?

How can I teach git to produce the correct merge result when
performing the same merge later on?

Custom merge driver.

Type `man gitattributes` and search for "custom merge driver"

Your merge driver can have whatever policy you can program, on a per
file basis.

					-Seth Robertson