🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← 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?

  1. A.git reset --hard origin/main
  2. B.git branch -D main
  3. C.git merge --abort
  4. 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 →