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

Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 24, 2020, 06:13 UTC
Message-ID
<xmqqmty34tph.fsf@gitster.c.googlers.com>
In-Reply-To
<CAEdQ38En=HrG9A0STgaxFAwqxBjwNGQoV=U26Pia3x=gd-Attg@mail.gmail.com>
Matt Turner <mattst88@gentoo.org> writes:
> ... is there a way git can be configured to
> fallback to another merge driver if the first returns a non-zero
> status due to unresolved conflicts? For example, if there are changes
> to other lines, how can I fall back to another merge driver?

There is no "fallback", but a merge driver should be able to first run another merge driver (e.g. "git merge-file" or the "merge" command from the RCS suite of programs would be line-oriented 3-way drivers suitable for text files) and then fix up the leftover bits.

If your users don't want to contaminate the .gitattributes file that is recorded in-tree, they can also use .git/info/attributes to locally configure Git to use such a driver.

Previous: Matt Turner
Message 6 of 6 in “Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword”
  1. Matt TurnerDec 22, 2020
  2. Beat BolliDec 23, 2020
  3. Junio C HamanoDec 23, 2020
  4. Junio C HamanoDec 23, 2020
  5. Matt TurnerDec 24, 2020
  6. Junio C HamanoDec 24, 2020

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.