From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2026 18:24:09 GMT
Subject: Re: [PATCH v2 4/6] doc: git-revert: link to new merge conflicts guide
Message-ID: <xmqqwlrqpwae.fsf@gitster.g>
In-Reply-To: <cfa0a8254ad88aa954af9cc3c4151993e07fe91c.1791547213.git.gitgitgadget@gmail.com>

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

> From: Julia Evans <julia@jvns.ca>
>
> Signed-off-by: Julia Evans <julia@jvns.ca>
> ---
>  Documentation/git-revert.adoc | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/Documentation/git-revert.adoc b/Documentation/git-revert.adoc
> index ffba365e63..1edf98b9aa 100644
> --- a/Documentation/git-revert.adoc
> +++ b/Documentation/git-revert.adoc
> @@ -31,6 +31,10 @@ both will discard uncommitted changes in your working directory.
>  See "Reset, restore and revert" in linkgit:git[1] for the differences
>  between the three commands.
>  
> +If there have been new commits since the reverted commit, there may
> +be a merge conflict. See linkgit:gitmergeconflicts[7]
> +(or `git help mergeconflicts`) for a guide to handling merge conflicts.
> +

This is a strange thing to say.  Is it worth special casing the
revert of the tip commit that much?  "Reverting a commit may resolt
in a merge conflict" should be sufficient, I would think.



>  OPTIONS
>  -------
>  <commit>...::
> @@ -162,6 +166,7 @@ include::config/revert.adoc[]
>  SEE ALSO
>  --------
>  linkgit:git-cherry-pick[1]
> +linkgit:gitmergeconflicts[7]
>  
>  GIT
>  ---