From: Samuel Tardieu Date: Sun, 16 Nov 2008 14:19:47 GMT Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches? Message-ID: <2008-11-16-15-19-47+trackit+sam@rfc1149.net> In-Reply-To: <2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com> >>>>> "Richard" == Richard Hartmann writes: Richard> The question is if there is a way to to merge these branches Richard> in a way that is conflict-free and includes all Richard> lines. Obviously, the order of the lines is irrelevant and Richard> can be random. You can use a custom merge driver especially designed for this case. See gitattributes(5) man page for an explanation of how it works. Sam -- Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/