Git · Middle · Question 40 of 75
Why can a rebase with many commits be more painful than a merge?
- 1Rebase always conflicts on every changed file
- ✓Correct answer: Conflicts may need resolving once per replayed commit
- 3Rebase can't continue after any conflict at all
Explanation
Merge resolves differences once at the end; rebase replays commits one by one. Squashing the branch first or enabling rerere reduces the pain.