From 71b0f996a47ff2b82cef072592ceab749544a9a2 Mon Sep 17 00:00:00 2001 From: Julia Evans Date: Mon, 12 Oct 2026 14:53:15 +0000 Subject: [PATCH] doc: git-pull: link to new merge conflicts guide Signed-off-by: Julia Evans Signed-off-by: Junio C Hamano --- Documentation/git-pull.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index 88f4fd3926..73f6d460bb 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -38,7 +38,8 @@ or `pull.ff` with your preferred behaviour. If there's a merge conflict during the merge or rebase that you don't want to handle, you can safely abort it with `git merge --abort` or -`git rebase --abort`. +`git rebase --abort`. See linkgit:gitmergeconflicts[7] +(or `git help mergeconflicts`) for a guide to handling merge conflicts. OPTIONS -------