Git · Junior · Question 23 of 75
How do you abort a merge that has conflicts and go back to the previous state?
- 1
git merge --undo - ✓Correct answer:
git merge --abort - 3
git reset --merge-all
Explanation
--abort restores the branch and working tree to how they were before the merge started. For a rebase the equivalent is git rebase --abort.