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

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

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

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

  Sam

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

Thanks.

Richard

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

gitattributes(5) and look for "union"?

On Sun, Nov 16, 2008 at 17:28, Junio C Hamano <gitster@pobox.com> wrote:

Thanks.

Richard