jprdonnelly/docs
1
0
Fork 0
mirror of synced 2026-01-10 18:02:53 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12214 from reginaalyssa/fix/merge-conflict-link

Browse Source 
Fix link to merge conflict docs
This commit is contained in:
Ramya Parimi
2021-11-22 10:23:02 -06:00
committed by GitHub
parent e1f18f20a4 7caf6efef8
commit 377a947f13
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ $ git pull <em>remotename</em> <em>branchname</em>
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.