← Quiz: Resolving Merge Conflicts: all 15 questions
Quiz: Resolving Merge Conflicts · Question 6 of 15
You started a merge, saw 40 conflicts and want to go back to exactly how things were before. Which command?
You started a merge, saw 40 conflicts and want to go back to exactly how things were before. Which command?
- A.git reset --hard origin/main
- B.git branch -D main
- C.git merge --abort
- D.git stash pop
Answer & explanation
Correct answer: git merge --abort
merge --abort cancels the merge and restores the pre-merge state.
Can you get the rest right without peeking?
Take the timed Quiz: Resolving Merge Conflicts quiz free. Pass it to earn XP and count towards your certificate.
Start the quiz →