From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2026 18:36:35 GMT
Subject: Re: [PATCH v2 0/6] [doc] Add new page on merge conflicts
Message-ID: <xmqqik3apvpo.fsf@gitster.g>
In-Reply-To: <pull.2237.v2.git.1791547213.gitgitgadget@gmail.com>

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

> Julia Evans (6):
>   doc: add new gitmergeconflicts man page
>   doc: git-merge: link to new merge conflicts guide
>   doc: git-rebase: link to new merge conflicts guide
>   doc: git-revert: link to new merge conflicts guide
>   doc: git-cherry-pick: link to new merge conflicts guide
>   doc: git-pull: link to new merge conflicts guide

I've sent detailed reviews on #1 and commented on others.

You add my Reviewed-by: on [2/6], [3/6], and [6/6] if your new
iteration uses them as-is.  My suggestions to [4/6] and [5/6] are
both straight-forward, so if you choose to take them literally,
you can add my Reviewed-by: on them, too.

Thanks.