Re: [PATCH v3 0/6] [doc] Add new page on merge conflicts
- From
D. Ben Knoble <ben.knoble@gmail.com>
- Date
- Oct 12, 2026, 15:53 UTC
- Message-ID
- <CALnO6CAL7ogi5MDRJmzTqNjjG-S39rDn=GTx3nwM5ASz_kRZOg@mail.gmail.com>
- In-Reply-To
- <pull.2237.v3.git.1791816795.gitgitgadget@gmail.com>
On Mon, Oct 12, 2026 at 10:53 AM Julia Evans via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 16 quoted lines
> > 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 <hello@marieflanagan.com> > - Reviewed-by: D. Ben Knoble <ben.knoble+github@gmail.com> > - Reviewed-by: Patrick Steinhardt <ps@pks.im> > + Helped-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Maybe this got lost in the shuffle, but I do prefer to use <ben.knoble@gmail.com> for Git these days, thanks!
> + Helped-by: Patrick Steinhardt <ps@pks.im> > + Signed-off-by: Julia Evans <julia@jvns.ca> > + Signed-off-by: Marie Claire LeBlanc Flanagan <hello@marieflanagan.com> > Signed-off-by: Julia Evans <julia@jvns.ca>
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