How to undo a merge in GitHub

Question

I have been working in PhpStorm on a dedicated branch, but when pushing to github, I inadvertently merged to the master branch.

How would I undo the merge both in github and locally? The github master is used to migrate code to various servers so I need to rollback to the previous commit prior to the merge rather than create a new commit with my changes undone.

Possible duplicate of Rollback a Git merge

Hatted Rooster
– Hatted Rooster

2017-03-17 14:35:53 +00:00
Commented Mar 17, 2017 at 14:35 — Hatted Rooster
– Hatted Rooster, Commented Mar 17, 2017 at 14:35

kkflf · Accepted Answer · 2022-01-30 15:53:15Z

35

You need to reset the head to the commit just before your current head.

git reset --hard <commit_before_merge>

E.g. git reset --hard master^

edited Jan 30, 2022 at 15:53

answered Mar 17, 2017 at 14:42

kkflf

2,5804 gold badges31 silver badges43 bronze badges

Sign up to request clarification or add additional context in comments.

4 Comments

BobbyP Over a year ago

That will reset my local branch. Is it then just a case of pushing to update github?

kkflf Over a year ago

You can either reset or checkout the previous commit and push that to github as head. Checkout the previous commit checkout master^

Siddu Over a year ago

But hard reset or previous commit will need force push, right? A force push overwrites public history and requires everyone who has cloned the repo to rebase their clone.

kkflf Over a year ago

@Siddu Sorry for getting back to you so late. Yes, you have to do a force push. git push -f.

John Doherty · Accepted Answer · 2021-11-09 17:55:17Z

To answer this more succinctly:

git checkout master git reset --hard <commit_before_merge> git push -f

Collectives™ on Stack Overflow

How to undo a merge in GitHub

2 Answers 2

4 Comments

Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

4 Comments

Comments

Linked

Related