Hi Junio, On Tue, Jul 8, 2025 at 5:44 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > [snip] > > * ac/auto-comment-char-fix (2025-06-30) 1 commit > - commit: avoid scanning trailing comments when 'core.commentChar' is "auto" > > "git commit" that concludes a conflicted merge failed to notice and remove > existing comment added automatically (like "# Conflicts:") when the > core.commentstring is set to 'auto'. > > Expecting a reroll. > cf. <f22e864e-669d-457c-838e-961bbc977c4b@xxxxxxxxx> > source: <20250630182527.69167-1-ayu.chandekar@xxxxxxxxx> > I sent an RFC related to this recently: [1] I will send an updated patch once I receive some feedback on it. Thanks! [1]: https://lore.kernel.org/git/CAE7as+YXwesgk2tna4kEC34EbQ=-eA+thQBqU3qnveDh9rbt8g@xxxxxxxxxxxxxx/
