Menu
I accidentally did a git pull origin master from dev, and master got merged into dev. Is it possible to unmerge?
I've already seen different solutions, i tried this one from both dev and master : git revert -m 1 <commit> (once each) But i got : Everything is up-to-date, each time
668
Select the Merge & Center down arrow. Select Unmerge Cells.
You can undo a Git merge using the git reset –merge command. This command changes all files that are different between your current repository and a particular commit. There is no “git undo merge” command but the git reset command works well to undo a merge.
You can use the Git reset command to undo a merge. Firstly, you need to check for the commit hash (or id) so you can use it to go back to the previous commit. To check for the hash, run git log or git reflog . git reflog is a better option because things are more readable with it.
You can reset your branch to the state it was in just before the merge if you find the commit it was on then.
One way is to use git reflog, it will list all the HEADs you've had. I find that git reflog --relative-date is very useful as it shows how long ago each change happened.
Once you find that commit just do a git reset --hard <commit id> and your branch will be as it was before.
If you have SourceTree, you can look up the <commit id> there if git reflog is too overwhelming.
177
If you haven't committed the merge, then use:
git merge --abort
31
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
