On 8/4/2021 1:38 AM, Elijah Newren via GitGitGadget wrote: > This is a reroll of my RFC series[1] to switch the default merge backend > from recursive to ort. The consensus seems to be that we should do this > immediately after the 2.33 release. > > Note that folks who want to get the old merge backend after this series can > simply set pull.twohead=recursive. (And, similarly, before this series, > those who want to try out ort in Git 2.32 or Git 2.33 can set > pull.twohead=ort.) > > Changes since the RFC version of this series: > > * Now depends on the reroll of en/merge-strategy-docs I just submitted[2]. > * Made tweaks to code and documentation suggested by Stolee, Dscho, and > Ævar I'm happy with this version (modulo a super tiny nitpick that doesn't merit a re-roll) and the docs that preceded it. I'm going to adapt my version for the microsoft/git fork to take this version and put it in our v2.33.0 release. Thanks, -Stolee
