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

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

From
Richard Hartmann <richih.mailinglist@gmail.com>
Date
Nov 16, 2008, 21:43 UTC
Message-ID
<2d460de70811161343w52a9a4deo7c8d9bb155514de0@mail.gmail.com>
In-Reply-To
<2008-11-16-15-19-47+trackit+sam@rfc1149.net>
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
Previous: Samuel TardieuNext: Junio C Hamano
Message 3 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.