Undo a Git merge that hasn't been pushed yetI accidentally ran git merge some_other_branch on my local master branch. I haven't pushed the changes to origin master. How do I undo the merge? After merging, git status says: # On branch master # Your branch is ahead of 'origin/master' by 5 commits. How do I undo all these commits?
Merge (with squash) all changes from another branch as a single commit
