Git Undo Merge of Branches that was worked on at same time

Question

We have a dev branch, and a separate feature branch which I've been working. Using GitHub's UI, I've accidentally merged the dev branch (and all it's new commits) into the feature branch.

I want to purge all of the dev branches changes. I thought about creating a new branch, then just cherry picking from the feature branch given the mess this has created.

Here is the Git log graph if that helps.

| *   14d6767 (origin/feature/) Merge branch 'development' into feature/
| |\
| |/
|/|
* |   2d88b27 Merge remote-tracking branch 'origin/master' into development

Has anyone pulled/synched the `feature` branch since the accidental merge? — Tim Biegeleisen, Oct 12 '18 at 05:10
Hi @TimBiegeleisen , yes people pulled the `feature` branch. — SelfishCosmonaut, Oct 12 '18 at 05:12
Possible duplicate of [How to revert a merge commit that's already pushed to remote branch?](https://stackoverflow.com/questions/7099833/how-to-revert-a-merge-commit-thats-already-pushed-to-remote-branch). — Tim Biegeleisen, Oct 12 '18 at 05:12
Please read the above link, which will explain how you may handle this. — Tim Biegeleisen, Oct 12 '18 at 05:13
I ended up force pushing the local version of my branch. Given that I had merged using GitHub's UI and hadn't pulled myself. — SelfishCosmonaut, Oct 12 '18 at 05:45
`and hadn't pulled myself` ... but is it possible that _others_ may have pulled? This is why I asked that earlier question. Of course, if you nuke the merge commit and force push, this is the easiest thing to do, but there is a risk there. — Tim Biegeleisen, Oct 12 '18 at 05:47

score 1 · Accepted Answer · answered Oct 12 '18 at 07:07

1

You could:

git reset commit_before_merge
git checkout commit_before_merge followed by git checkout -b feature/this_works, and then, optionally, cherry-pick in any other changes that look OK

answered Oct 12 '18 at 07:07

tymtam

31,798
8
86
126

Git Undo Merge of Branches that was worked on at same time

1 Answers1