Re: Conflict-free merging (i.e. concat) of conflicting branches?

"Richard Hartmann" [off-list ref] 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"?

On Sun, Nov 16, 2008 at 17:28, Junio C Hamano [off-list ref] wrote:

gitattributes(5) and look for "union"?

Thanks.


Richard