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

1. git stash

2. git branch -d the_local_branch

3. git checkout -t

4. git stash apply

This worked for me..!!