Git · Middle · Question 4 of 75
During a rebase you hit a conflict. What's the usual sequence?
- 1Run
git rebase --skipto keep both of the versions - 2Fix the files, then run
git commit -m "merge fix" - ✓Correct answer: Fix the files,
git addthem, thengit rebase --continue
Explanation
Rebase stops on the commit that conflicts; once resolved and staged, --continue moves to the next one. --skip drops the current commit entirely, --abort restores the original branch.