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

Re: Feature request: a merge strategy that makes any file difference a merge conflict

From
MEMichael Ernst <mernst@cs.washington.edu>
Date
Mar 29, 2024, 20:43 UTC
Message-ID
<CAAJCdQQceA7yANHCPzUGbANR-XKVDUzfN5ym6Rb-oEWgcq=4Uw@mail.gmail.com>
In-Reply-To
<xmqqfrw8ygg2.fsf@gitster.g>
Junio-

Thank you for the clarification. There is a lot of misleading information about this on the Internet.

I was mistaken about when a merge driver is called. Now I see that the merge driver is called anytime that no two of {base,parent1,parent2} are the same. This means that a merge driver *can* prevent a clean-but-incorrect merge. I was right that a mergetool cannot be used to correct a clean-but-incorrect merge.

-Mike
Previous: Junio C HamanoNext: Thomas Braun
Message 3 of 4 in “Feature request: a merge strategy that makes any file difference a merge conflict”
  1. Michael ErnstMar 29, 2024
  2. Junio C HamanoMar 29, 2024
  3. Michael ErnstMar 29, 2024
  4. Thomas BraunApr 1, 2024

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.