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

["Richard Hartmann" <richih.mailinglist@gmail.com>]

Please keep the CC intact if possible.

Hi all,

the vim_extended repo, a collection of patchsets against Vim,
allows users to merge different patchsets on top of a current
vanilla Vim. To keep track of which patches are merged, we
would want to use a special variable designated by Vim for
this purpose.

For example, branch a would have file foo with line 100:

$patches .= " with_patch_a";

branch b would have file foo with line 100:

$patches .= " with_patch_b";

etc, etc.

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.


Thanks for all thoughts,
Richard