From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Nov 2008 16:28:31 GMT
Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Message-ID: <7viqqn4ouo.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com>

"Richard Hartmann" <richih.mailinglist@gmail.com> writes:

> The question is if there is a way to to merge these
> branches in a way that is conflict-free and includes
> all lines. Obviously, the order of the lines is irrelevant
> and can be random.

gitattributes(5) and look for "union"?