You ran git rebase main on your feature branch but got conflicts. After resolving conflicts, which command should you run to continue the rebase?

medium📝 Troubleshoot Q14 of 15

Git - Rebasing

You ran git rebase main on your feature branch but got conflicts. After resolving conflicts, which command should you run to continue the rebase?

Agit commit -m 'resolved conflicts'

Bgit merge --continue

Cgit rebase --continue

Dgit rebase --abort

Step-by-Step Solution

Solution:

Step 1: Identify the correct command to continue rebase after conflicts
After resolving conflicts during a rebase, git rebase --continue tells Git to proceed with applying remaining commits.
Step 2: Understand other options
git merge --continue is for merge conflicts, not rebase; git commit -m is manual commit but rebase expects --continue; git rebase --abort cancels the rebase.
Final Answer:
git rebase --continue -> Option C
Quick Check:
Continue rebase after conflicts = git rebase --continue [OK]

Quick Trick: Use 'git rebase --continue' after resolving conflicts [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