From: D. Ben Knoble Date: Mon, 12 Oct 2026 15:53:55 GMT Subject: Re: [PATCH v3 0/6] [doc] Add new page on merge conflicts Message-ID: In-Reply-To: On Mon, Oct 12, 2026 at 10:53 AM Julia Evans via GitGitGadget wrote: > > Range-diff vs v2: > > 1: ab0344f947 ! 1: 7aa0ae7ec3 doc: add new gitmergeconflicts man page > @@ Commit message > place, since it's a really nice example of a place Git has a consistent > interface between similar commands. > > + Only discuss merge, rebase, cherry-pick, and revert for now even though > + there are other ways that merge conflicts can happen because it's > + awkward to talk about `am`, `apply`, and `checkout -m`. > + > Co-Authored-By: Marie Claire LeBlanc Flanagan > - Reviewed-by: D. Ben Knoble > - Reviewed-by: Patrick Steinhardt > + Helped-by: D. Ben Knoble Maybe this got lost in the shuffle, but I do prefer to use for Git these days, thanks! > + Helped-by: Patrick Steinhardt > + Signed-off-by: Julia Evans > + Signed-off-by: Marie Claire LeBlanc Flanagan > Signed-off-by: Julia Evans I don't *think* we need your sign-off twice here, but maybe you intended to communicate something by this ordering? I confess I'm not sure what it would be ':D -- D. Ben Knoble