Undo a git merge (hasn't been pushed yet)

git merge revert
Max Williams picture Max Williams · May 10, 2011 · Viewed 60.5k times · Source

I just committed some changes into one of my feature branches ("feedback_tab") then, checked out "master" and merged them in there. I actually meant to merge them into my "development" branch.

Now, master is ahead of 'origin/master' (its remote) by 17 commits - I haven't pushed the merge up (and don't want to, obviously). How can I revert master back to the same state as before the accidental merge? I'm confused between git revert and git reset with this stuff.

I looked in my git log and there's no entry for merging feedback_tab into master. I'd have thought it would be the top entry?

Bit confused :/ any help welcome! max

Answer

Hemerson Varela picture Hemerson Varela · Nov 6, 2014

To undo a merge that was NOT pushed:

git reset --merge ORIG_HEAD

If during the merge you get a conflict, the best way to undo the merge is:

git merge --abort

Related questions

Git: how to revert a branch merge without overwriting history?

I have two branches: master and opengl. I recently finished implementation (or at least I thought so) of opengl branch and decided to merge it into master: git checkout master git merge opengl git push After I did this, several …

Read More
How to PR and merge again after reverting PR using Github Revert Button

Basically I used Github revert button to revert a previous PR for a feature branch into master, then I decided to merge the same feature branch that I reverted earlier, but I was not able to do so. Steps as …

Read More
Reset/revert a whole branch to another branches state?

I have a branch A and a branch B (and some other branches). Lets say A's commit history looks like: commit 5 commit 4 commit 3 ... And B's commit history: some other commit commit 4 merge of other stuff from branch C (into branch …

Read More