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

Re: Custom merge driver with no rename detection

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 15, 2016, 05:10 UTC
Message-ID
<xmqqpovyr22u.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CALMa68ovz=VZYkCcUDvEn1d7=xJDx__71caqsPXUFASZ1phfdw@mail.gmail.com>
Felipe Gonçalves Assis <felipeg.assis@gmail.com> writes:
> The usual workaround is using the resolve strategy, but apparently it
> ignores the custom merge driver.
Hmph.

Indeed, git-merge-file seems to call xdl_merge() directly, bypassing the ll_merge(), which is understandable as the former predates the latter. That needs to be fixed, I think.

Previous: Felipe Gonçalves AssisNext: Johannes Schindelin
Message 2 of 8 in “Custom merge driver with no rename detection”
  1. Felipe Gonçalves AssisFeb 14, 2016
  2. Junio C HamanoFeb 15, 2016
  3. Johannes SchindelinFeb 15, 2016
  4. Junio C HamanoFeb 15, 2016
  5. Johannes SchindelinFeb 15, 2016
  6. Felipe Gonçalves AssisFeb 15, 2016
  7. Junio C HamanoFeb 15, 2016
  8. Felipe Gonçalves AssisFeb 16, 2016

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.