Git - Rebasing
After encountering conflicts during a rebase, which command should you run to continue the process once conflicts are resolved?
After encountering conflicts during a rebase, which command should you run to continue the process once conflicts are resolved?
medium📝 Troubleshoot Q6 of 15
Step-by-Step Solution
Solution:
Step 1: Resolve conflicts
Manually fix the conflicting files in your working directory.Step 2: Continue rebase
Rungit rebase --continueto tell Git to proceed with the rebase after conflict resolution.Final Answer:
git rebase --continue -> Option AQuick Check:
Usegit rebase --continueafter fixing conflicts [OK]
Quick Trick: Run 'git rebase --continue' after resolving conflicts [OK]
Common Mistakes:
- Using 'git rebase --abort' which cancels the rebase
- Trying 'git merge --continue' during rebase
- Resetting hard and losing changes
Master "Rebasing" in Git
Want More Practice?
15+ quiz questions · All difficulty levels · Free
Free Signup - Practice All QuestionsMore Git Quizzes