git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Samuel Tardieu <sam@rfc1149.net>
Date
Nov 16, 2008, 14:19 UTC
Message-ID
<2008-11-16-15-19-47+trackit+sam@rfc1149.net>
In-Reply-To
<2d460de70811160550g75e50e00gb50d3b2045c460af@mail.gmail.com>
>>>>> "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/
Previous: Richard HartmannNext: Richard Hartmann
Message 2 of 5 in “Conflict-free merging (i.e. concat) of conflicting branches?”
  1. Richard HartmannNov 16, 2008
  2. Samuel TardieuNov 16, 2008
  3. Richard HartmannNov 16, 2008
  4. Junio C HamanoNov 16, 2008
  5. Richard HartmannNov 16, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.