From: Ævar Arnfjörð Bjarmason Date: Mon, 08 Mar 2021 13:12:15 GMT Subject: Re: [PATCH 11/11] merge-recursive: add a bunch of FIXME comments documenting known bugs Message-ID: <87sg55iyc0.fsf@evledraar.gmail.com> In-Reply-To: <0409118d4ff76a8dc0285c436f89478176752955.1614905738.git.gitgitgadget@gmail.com> On Fri, Mar 05 2021, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > The plan is to just delete merge-recursive, but not until everyone is > comfortable with merge-ort as a replacement. Given that I haven't > switched all callers of merge-recursive over yet (e.g. git-am still uses > merge-recursive), maybe there's some value documenting known bugs in the > algorithm in case we end up keeping it or someone wants to dig it up in > the future. Yes, I think that's very useful.