Re: Conflict-free merging (i.e. concat) of conflicting branches?
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:39
"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"?