Undo a Git merge that hasn't been pushed yet

Question

Within my master branch, I did a git merge some-other-branch locally, but never pushed the changes to origin master. I didn\'t mean to merge, so I\'d like to un

Answer 1

If you didn't commit it yet, you can only use

$ git checkout -f

It will undo the merge (and everything that you did).