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

Merge pull request #22630 from github/repo-sync

Browse Source 
repo sync
This commit is contained in:
Octomerger Bot
2021-11-04 17:14:16 -04:00
committed by GitHub
parent cbcd383323 7524d7357e
commit d1021f024c
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/resolving-merge-conflicts-after-a-git-rebase.md
View File

@@ -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.