Merge pull request #22630 from github/repo-sync

repo sync

Author: Octomerger

content/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase.md

@@ -30,4 +30,4 @@ Here, Git is telling you which commit is causing the conflict (`fa39187`). You'r
 * You can run `git rebase --skip` to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is very rare that you would choose this option.
 * You can fix the conflict.
 
-To fix the conflict, you can follow [the standard procedures for resolving merge conflicts from the command line](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line. When you're finished, you'll need to call `git rebase --continue` in order for Git to continue processing the rest of the rebase.
+To fix the conflict, you can follow [the standard procedures for resolving merge conflicts from the command line](/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line). When you're finished, you'll need to call `git rebase --continue` in order for Git to continue processing the rest of the rebase.