From 93c6674ccf7931b567ec816e196de4aa52ba1e13 Mon Sep 17 00:00:00 2001 From: sparshsah Date: Wed, 3 Nov 2021 13:00:41 -0400 Subject: [PATCH] add-missing-right-paren --- .../using-git/resolving-merge-conflicts-after-a-git-rebase.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase.md b/content/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase.md index d17ab84e932f..390f14f93744 100644 --- a/content/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase.md +++ b/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.