[PATCH v2 4/6] doc: git-revert: link to new merge conflicts guide

From

Julia Evans via GitGitGadget <gitgitgadget@gmail.com>

Date

Oct 9, 2026, 12:00 UTC

Message-ID

<cfa0a8254ad88aa954af9cc3c4151993e07fe91c.1791547213.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.2237.v2.git.1791547213.gitgitgadget@gmail.com>

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

-- 
gitgitgadget