From: git@isandrew.com
Date: Sun, 25 Dec 2022 17:19:10 GMT
Subject: Theirs merge strategy
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