From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sun, 16 Nov 2008 21:43:44 GMT
Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Message-ID: <2d460de70811161343w52a9a4deo7c8d9bb155514de0@mail.gmail.com>
In-Reply-To: <2008-11-16-15-19-47+trackit+sam@rfc1149.net>

On Sun, Nov 16, 2008 at 15:19, Samuel Tardieu <sam@rfc1149.net> wrote:

> You can use a custom merge driver especially designed for this case.
> See gitattributes(5) man page for an explanation of how it works.

Thanks.


Richard