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

Just create new branch, then cherry-pick desired commits to it.

Its saver and simpler then resets described in many answers above