Jeff King <peff@xxxxxxxx> writes: > On Wed, Feb 28, 2024 at 09:44:09AM +0000, Johannes Schindelin via GitGitGadget wrote: > >> @@ -1402,6 +1436,8 @@ static int merge_mode_and_contents(struct merge_options *opt, >> &o->oid, >> &a->oid, >> &b->oid); >> + if (result->clean < 0) >> + return -1; > > Sorry, I accidentally commented on v2 of your series a moment ago, > rather than the most recent version. But this hunk was untouched between > the two, so the comment still applies: > > https://lore.kernel.org/git/20240301065647.GA2680308@xxxxxxxxxxxxxxxxxxxxxxx/ > > -Peff Thanks for spotting. The topic now is in 'next' so let's fix it incrementally while I'll hold it there. If all of us thought it has seen enough eyeballs and is good enough for 'next', yet we later find there was something we all missed, that is worth a separate explanation, e.g., "The primary motivation behind the series is still good, but for such and such reasons we missed this case we are fixing."
