Theirs merge strategy
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Theirs merge strategy
- From: git@xxxxxxxxxxxx
- Date: Mon, 26 Dec 2022 02:19:10 +0900
- User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0
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
[Index of Archives]
[Linux Kernel Development]
[Gcc Help]
[IETF Annouce]
[DCCP]
[Netdev]
[Networking]
[Security]
[V4L]
[Bugtraq]
[Yosemite]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Linux SCSI]
[Fedora Users]