You encounter conflicts during a git rebase. After manually fixing the conflicts, what is the correct next step to continue the rebase?

medium📝 Troubleshoot Q6 of 15

Git - Rebasing

You encounter conflicts during a git rebase. After manually fixing the conflicts, what is the correct next step to continue the rebase?

ARun <code>git merge --abort</code>

BRun <code>git rebase --continue</code>

CRun <code>git reset --hard</code>

DRun <code>git commit --amend</code>

Step-by-Step Solution

Solution:

Step 1: Identify rebase conflict resolution process
After resolving conflicts manually, Git requires confirmation to proceed.
Step 2: Use correct command
git rebase --continue tells Git to resume the rebase after conflict resolution.
Step 3: Analyze other options
git merge --abort aborts a merge, not rebase.
git reset --hard discards changes.
git commit --amend modifies last commit, not related to continuing rebase.
Final Answer:
Run git rebase --continue is correct.
Quick Check:
Use git rebase --continue after fixing conflicts. [OK]

Quick Trick: After fixing conflicts, run 'git rebase --continue' [OK]

Common Mistakes:

Master "Rebasing" in Git

9 interactive learning modes - each teaches the same concept differently

Want More Practice?

15+ quiz questions · All difficulty levels · Free

More Git Quizzes