Re: [PATCH 0/2] [RFC] Switch default merge backend from recursive to ort
- From
Jeff King <peff@peff.net>
- Date
- Aug 3, 2021, 22:37 UTC
- Message-ID
- <YQnFMmyd744Oolep@coredump.intra.peff.net>
- In-Reply-To
- <xmqqim0mtc3u.fsf@gitster.g>
On Tue, Aug 03, 2021 at 03:08:53PM -0700, Junio C Hamano wrote:
Show 14 quoted lines
> Jeff King <peff@peff.net> writes: > > > It would make sense to me to do the switch in 'next' early in the > > post-v2.33 cycle. It can cook there for a bit, but I think we have found > > that it's much more likely to see actual use once it hits 'master'. So I > > don't see a particular reason to have it sit in 'next' for a long time. > > We should get as much exposure in 'master' during the v2.34 cycle as > > possible. > > I do not mind queuing what is available today to 'next' to gain 2 > more weeks of dogfood time during the pre-release freeze. If an > simple escape hatch that lets us say "anytime we ask ort, use > recursive instead as an emergency measure" can be added with a > trivially obvious small patch, that would be a plus.
Yeah, I am happy even starting the 'next' portion sooner than the release. :) As Elijah explained, we already have that emergency measure in place (pull.merge).
-Peff