Re: [PATCH v2 0/6] [doc] Add new page on merge conflicts

From: Ben Knoble <ben.knoble@gmail.com>
Date: Oct 9, 2026, 22:10 UTC
Message-ID: <E227CF3E-65FA-447E-936B-BF23DE5A2649@gmail.com>
In-Reply-To: <xmqqse2evq2k.fsf@gitster.g>

Show 20 quoted lines

> Le 9 oct. 2026 à 11:41, Junio C Hamano <gitster@pobox.com> a écrit :
> 
> > "Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> 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 <julia@jvns.ca>
>> 
>>       ## Commit message ##
>>     -    [doc] Add new gitmergeconflicts man page
>>     +    doc: add new gitmergeconflicts man page
>> ...
>>          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>
>>          Signed-off-by: Julia Evans <julia@jvns.ca>

PS I think I just use my non-suffixed email on this project; see our .mailmap :)