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

Theirs merge strategy

From
Ggit@isandrew.com <git@isandrew.com>
Date
Dec 25, 2022, 17:19 UTC
Message-ID
<5b64c7f5-59e3-f319-4efa-4624907436b6@isandrew.com>

Would it be possible to revisit the decision to not have a "theirs" merge strategy?

I think there are legitimate reasons to use it, beyond the plenty of rope argument.

One example is you're working with a successfully written and operating branch through multiple releases, but due to some external change (product direction, upstream changes) you decide that an approach in a different branch is better.  You want to use the other branch, while keeping the history of the successful prior releases, for all the normal reasons one wants to keep history.  A hard reset wouldn't help in this case.

The decision to remove it was to prevent people from having bad workflows.  In reality, in lieu of theirs people use ours in reverse which is even worse.

The previous discussion I found was at https://marc.info/?l=git&m=121637513604413&w=2

Next: rsbecker@nexbridge.com
Message 1 of 3 in “Theirs merge strategy”
  1. git@isandrew.comDec 25, 2022
  2. rsbecker@nexbridge.comDec 25, 2022
  3. git@isandrew.comDec 26, 2022

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.