From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2026 18:26:14 GMT
Subject: Re: [PATCH v2 5/6] doc: git-cherry-pick: link to new merge conflicts guide
Message-ID: <xmqqse2epw6x.fsf@gitster.g>
In-Reply-To: <62b70e9a02dfc9c5b5c980b71bb0507fa20cc0b9.1791547213.git.gitgitgadget@gmail.com>

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

> -When it is not obvious how to apply a change, the following
> -happens:
> +When it is not obvious how to apply a change, there may
> +be a merge conflict. See linkgit:gitmergeconflicts[7]
> +(or `git help mergeconflicts`) for a guide to handling merge conflicts.

"Obvious to whom" was the first thing that came to my mind, even
though the blame largely lies on the original.  Can't we get rid of
the above pragraph altogether, and "See new one" at the end where
you replaced "See git-merge" reference below?

> +When a merge conflict happens:
>  
>  1. The current branch and `HEAD` pointer stay at the last commit
>     successfully made.
> @@ -36,9 +39,6 @@ happens:
>     conflict markers `<<<<<<<` and `>>>>>>>`.
>  5. No other modifications are made.
>  
> -See linkgit:git-merge[1] for some hints on resolving such
> -conflicts.
> -
>  OPTIONS
>  -------
>  <commit>...::
> @@ -259,6 +259,7 @@ $ git cherry-pick -Xpatience topic^  <4>
>  SEE ALSO
>  --------
>  linkgit:git-revert[1]
> +linkgit:gitmergeconflicts[7]
>  
>  GIT
>  ---