From 0ef2da01fb0aa38db7710e248b41e457cfdeb2a3 Mon Sep 17 00:00:00 2001 From: Julia Evans Date: Mon, 12 Oct 2026 14:53:14 +0000 Subject: [PATCH] doc: git-cherry-pick: link to new merge conflicts guide Remove the discussion of merge conflicts and replace it with a link to the guide. Signed-off-by: Julia Evans Signed-off-by: Junio C Hamano --- Documentation/git-cherry-pick.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cherry-pick.adoc b/Documentation/git-cherry-pick.adoc index f4cd8b9db7..069e434961 100644 --- a/Documentation/git-cherry-pick.adoc +++ b/Documentation/git-cherry-pick.adoc @@ -19,8 +19,7 @@ Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit). -When it is not obvious how to apply a change, the following -happens: +When a merge conflict happens: 1. The current branch and `HEAD` pointer stay at the last commit successfully made. @@ -36,8 +35,8 @@ happens: conflict markers `<<<<<<<` and `>>>>>>>`. 5. No other modifications are made. -See linkgit:git-merge[1] for some hints on resolving such -conflicts. +See linkgit:gitmergeconflicts[7] (or `git help mergeconflicts`) +for a guide to handling merge conflicts. OPTIONS ------- @@ -259,6 +258,7 @@ $ git cherry-pick -Xpatience topic^ <4> SEE ALSO -------- linkgit:git-revert[1] +linkgit:gitmergeconflicts[7] GIT ---