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

Re: How to automatically correct an almost correct auto-merge?

From
SRSeth Robertson <in-gitvger@baka.org>
Date
Dec 16, 2011, 20:39 UTC
Message-ID
<201112162039.pBGKdR8H012831@no.baka.org>
In-Reply-To
<20111216203215.GG1868@goldbirke>
> How can I teach git to produce the correct merge result when
> performing the same merge later on?
Custom merge driver.
Type `man gitattributes` and search for "custom merge driver"

Your merge driver can have whatever policy you can program, on a per file basis.

					-Seth Robertson
Previous: SZEDER GáborNext: SZEDER Gábor
Message 2 of 4 in “How to automatically correct an almost correct auto-merge?”
  1. SZEDER GáborDec 16, 2011
  2. Seth RobertsonDec 16, 2011
  3. SZEDER GáborDec 17, 2011
  4. Neal KreitzingerDec 16, 2011

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.