{"thread":{"id":"16350","subject":"Conflict-free merging (i.e. concat) of conflicting branches?","startedAt":"2008-11-16T13:50:34Z","lastAt":"2008-11-16T21:44:03Z","messageCount":5,"participants":["Richard Hartmann","Samuel Tardieu","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"95942","messageId":"2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com","threadId":"16350","inReplyTo":null,"subject":"Conflict-free merging (i.e. concat) of conflicting branches?","fromName":"Richard Hartmann","fromEmail":"richih.mailinglist@gmail.com","sentAt":"2008-11-16T13:50:34Z","receivedAt":"2008-11-16T13:50:34Z","isPatch":false,"sender":{"key":"richih.mailinglist@gmail.com","avatar":"https://avatars.githubusercontent.com/u/754723?v=4"},"body":"Please keep the CC intact if possible.\n\nHi all,\n\nthe vim_extended repo, a collection of patchsets against Vim,\nallows users to merge different patchsets on top of a current\nvanilla Vim. To keep track of which patches are merged, we\nwould want to use a special variable designated by Vim for\nthis purpose.\n\nFor example, branch a would have file foo with line 100:\n\n$patches .= \" with_patch_a\";\n\nbranch b would have file foo with line 100:\n\n$patches .= \" with_patch_b\";\n\netc, etc.\n\nThe question is if there is a way to to merge these\nbranches in a way that is conflict-free and includes\nall lines. Obviously, the order of the lines is irrelevant\nand can be random.\n\n\nThanks for all thoughts,\nRichard\n"},{"id":"95943","messageId":"2008-11-16-15-19-47+trackit+sam@rfc1149.net","threadId":"16350","inReplyTo":"2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com","subject":"Re: Conflict-free merging (i.e. concat) of conflicting branches?","fromName":"Samuel Tardieu","fromEmail":"sam@rfc1149.net","sentAt":"2008-11-16T14:19:47Z","receivedAt":"2008-11-16T14:19:47Z","isPatch":false,"sender":{"key":"sam@rfc1149.net","avatar":"https://avatars.githubusercontent.com/u/44656?v=4"},"body":">>>>> \"Richard\" == Richard Hartmann <richih.mailinglist@gmail.com> writes:\n\nRichard> The question is if there is a way to to merge these branches\nRichard> in a way that is conflict-free and includes all\nRichard> lines. Obviously, the order of the lines is irrelevant and\nRichard> can be random.\n\nYou can use a custom merge driver especially designed for this case.\nSee gitattributes(5) man page for an explanation of how it works.\n\n  Sam\n-- \nSamuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/\n"},{"id":"95952","messageId":"7viqqn4ouo.fsf@gitster.siamese.dyndns.org","threadId":"16350","inReplyTo":"2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com","subject":"Re: Conflict-free merging (i.e. concat) of conflicting branches?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-16T16:28:31Z","receivedAt":"2008-11-16T16:28:31Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Richard Hartmann\" <richih.mailinglist@gmail.com> writes:\n\n> The question is if there is a way to to merge these\n> branches in a way that is conflict-free and includes\n> all lines. Obviously, the order of the lines is irrelevant\n> and can be random.\n\ngitattributes(5) and look for \"union\"?\n"},{"id":"95974","messageId":"2d460de70811161343w52a9a4deo7c8d9bb155514de0@mail.gmail.com","threadId":"16350","inReplyTo":"2008-11-16-15-19-47+trackit+sam@rfc1149.net","subject":"Re: Conflict-free merging (i.e. concat) of conflicting branches?","fromName":"Richard Hartmann","fromEmail":"richih.mailinglist@gmail.com","sentAt":"2008-11-16T21:43:44Z","receivedAt":"2008-11-16T21:43:44Z","isPatch":false,"sender":{"key":"richih.mailinglist@gmail.com","avatar":"https://avatars.githubusercontent.com/u/754723?v=4"},"body":"On Sun, Nov 16, 2008 at 15:19, Samuel Tardieu <sam@rfc1149.net> wrote:\n\n> You can use a custom merge driver especially designed for this case.\n> See gitattributes(5) man page for an explanation of how it works.\n\nThanks.\n\n\nRichard\n"},{"id":"95975","messageId":"2d460de70811161344n58cfb045n79b567493fef6a90@mail.gmail.com","threadId":"16350","inReplyTo":"7viqqn4ouo.fsf@gitster.siamese.dyndns.org","subject":"Re: Conflict-free merging (i.e. concat) of conflicting branches?","fromName":"Richard Hartmann","fromEmail":"richih.mailinglist@gmail.com","sentAt":"2008-11-16T21:44:03Z","receivedAt":"2008-11-16T21:44:03Z","isPatch":false,"sender":{"key":"richih.mailinglist@gmail.com","avatar":"https://avatars.githubusercontent.com/u/754723?v=4"},"body":"On Sun, Nov 16, 2008 at 17:28, Junio C Hamano <gitster@pobox.com> wrote:\n\n> gitattributes(5) and look for \"union\"?\n\nThanks.\n\n\nRichard\n"}]}