Skip to content

Commit 5168307

Browse files
committed
Fix link to merge conflict docs
1 parent 1f86d4b commit 5168307

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

content/get-started/using-git/getting-changes-from-a-remote-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $ git pull <em>remotename</em> <em>branchname</em>
7777

7878
Because `pull` performs a merge on the retrieved changes, you should ensure that
7979
your local work is committed before running the `pull` command. If you run into
80-
[a merge conflict](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
80+
[a merge conflict](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)
8181
you cannot resolve, or if you decide to quit the merge, you can use `git merge --abort`
8282
to take the branch back to where it was in before you pulled.
8383

0 commit comments

Comments
 (0)