Re: [PATCH 11/11] merge-recursive: add a bunch of FIXME comments documenting known bugs

From
Ævar Arnfjörð Bjarmason <hidden>
Date
2021-03-08 13:13:14
Reply to
Elijah Newren via GitGitGadget, 2021-03-05
On Fri, Mar 05 2021, Elijah Newren via GitGitGadget wrote:

From: Elijah Newren <redacted>

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.
Thread (44 messages) 44 messages, 4 authors, last reply 2021-03-17
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help