From 5168307e6a6aec4204c4e595b088a285427a7d20 Mon Sep 17 00:00:00 2001 From: Regina Alyssa Date: Sun, 21 Nov 2021 22:41:16 +0800 Subject: [PATCH] Fix link to merge conflict docs --- .../using-git/getting-changes-from-a-remote-repository.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/get-started/using-git/getting-changes-from-a-remote-repository.md b/content/get-started/using-git/getting-changes-from-a-remote-repository.md index 0f6a6df2b4..209c0beb0e 100644 --- a/content/get-started/using-git/getting-changes-from-a-remote-repository.md +++ b/content/get-started/using-git/getting-changes-from-a-remote-repository.md @@ -77,7 +77,7 @@ $ git pull remotename branchname Because `pull` performs a merge on the retrieved changes, you should ensure that your local work is committed before running the `pull` command. If you run into -[a merge conflict](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line +[a merge conflict](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line) you cannot resolve, or if you decide to quit the merge, you can use `git merge --abort` to take the branch back to where it was in before you pulled.