From: Seth Robertson <in-gitvger@baka.org>
Date: Fri, 16 Dec 2011 20:39:27 GMT
Subject: Re: How to automatically correct an almost correct auto-merge?
Message-ID: <201112162039.pBGKdR8H012831@no.baka.org>
In-Reply-To: <20111216203215.GG1868@goldbirke>


> 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