From: Ben Knoble Date: Fri, 09 Oct 2026 22:10:05 GMT Subject: Re: [PATCH v2 0/6] [doc] Add new page on merge conflicts Message-ID: In-Reply-To: > Le 9 oct. 2026 à 11:41, Junio C Hamano a écrit : > > > "Julia Evans via GitGitGadget" writes: > > For example, you added Ben and Patrick to the trailer of patch #1. > >> Range-diff vs v1: >> >> 1: ad4853dc36 ! 1: ab0344f947 [doc] Add new gitmergeconflicts man page >> @@ Metadata >> Author: Julia Evans >> >> ## Commit message ## >> - [doc] Add new gitmergeconflicts man page >> + doc: add new gitmergeconflicts man page >> ... >> Co-Authored-By: Marie Claire LeBlanc Flanagan >> + Reviewed-by: D. Ben Knoble >> + Reviewed-by: Patrick Steinhardt >> Signed-off-by: Julia Evans PS I think I just use my non-suffixed email on this project; see our .mailmap :)