* Conflict-free merging (i.e. concat) of conflicting branches? @ 2008-11-16 13:50 Richard Hartmann 2008-11-16 14:19 ` Samuel Tardieu 2008-11-16 16:28 ` Junio C Hamano 0 siblings, 2 replies; 5+ messages in thread From: Richard Hartmann @ 2008-11-16 13:50 UTC (permalink / raw) To: git; +Cc: markus.heidelberg 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Conflict-free merging (i.e. concat) of conflicting branches? 2008-11-16 13:50 Conflict-free merging (i.e. concat) of conflicting branches? Richard Hartmann @ 2008-11-16 14:19 ` Samuel Tardieu 2008-11-16 21:43 ` Richard Hartmann 2008-11-16 16:28 ` Junio C Hamano 1 sibling, 1 reply; 5+ messages in thread From: Samuel Tardieu @ 2008-11-16 14:19 UTC (permalink / raw) To: Richard Hartmann; +Cc: git, markus.heidelberg >>>>> "Richard" == Richard Hartmann <richih.mailinglist@gmail.com> writes: 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 -- Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/ ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Conflict-free merging (i.e. concat) of conflicting branches? 2008-11-16 14:19 ` Samuel Tardieu @ 2008-11-16 21:43 ` Richard Hartmann 0 siblings, 0 replies; 5+ messages in thread From: Richard Hartmann @ 2008-11-16 21:43 UTC (permalink / raw) To: Samuel Tardieu; +Cc: git, markus.heidelberg On Sun, Nov 16, 2008 at 15:19, Samuel Tardieu <sam@rfc1149.net> wrote: > You can use a custom merge driver especially designed for this case. > See gitattributes(5) man page for an explanation of how it works. Thanks. Richard ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Conflict-free merging (i.e. concat) of conflicting branches? 2008-11-16 13:50 Conflict-free merging (i.e. concat) of conflicting branches? Richard Hartmann 2008-11-16 14:19 ` Samuel Tardieu @ 2008-11-16 16:28 ` Junio C Hamano 2008-11-16 21:44 ` Richard Hartmann 1 sibling, 1 reply; 5+ messages in thread From: Junio C Hamano @ 2008-11-16 16:28 UTC (permalink / raw) To: Richard Hartmann; +Cc: git, markus.heidelberg "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"? ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Conflict-free merging (i.e. concat) of conflicting branches? 2008-11-16 16:28 ` Junio C Hamano @ 2008-11-16 21:44 ` Richard Hartmann 0 siblings, 0 replies; 5+ messages in thread From: Richard Hartmann @ 2008-11-16 21:44 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, markus.heidelberg On Sun, Nov 16, 2008 at 17:28, Junio C Hamano <gitster@pobox.com> wrote: > gitattributes(5) and look for "union"? Thanks. Richard ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-11-16 21:45 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-11-16 13:50 Conflict-free merging (i.e. concat) of conflicting branches? Richard Hartmann 2008-11-16 14:19 ` Samuel Tardieu 2008-11-16 21:43 ` Richard Hartmann 2008-11-16 16:28 ` Junio C Hamano 2008-11-16 21:44 ` Richard Hartmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).