How to undo a git merge with conflicts
I am on branch mybranch1. mybranch2 is forked from mybranch1 and changes were made in mybranch2.
Then, while on mybranch1, I have done git merge --no-commit mybranch2 It shows there were conflicts while merging.
Now I want do discard everything (the merge command) so that mybranch1 is back to what it was before. I have no idea how do I go about this.
Latest Git:
git merge --abort
This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes from before the merge, although it cannot always do so reliably. Generally you shouldn't merge with uncommitted changes anyway.
Prior to version 1.7.4:
git reset --merge
This is older syntax but does the same as the above.
Prior to version 1.6.2:
git reset --hard
which removes all uncommitted changes, including the uncommitted merge. Sometimes this behaviour is useful even in newer versions of Git that support the above commands.
Actually, it is worth noticing that git merge --abort is only equivalent to git reset --merge given that MERGE_HEAD is present. This can be read in the git help for merge command.
git merge --abort # is equivalent to git reset --merge when MERGE_HEAD is present.
After a failed merge, when there is no MERGE_HEAD, the failed merge can be undone with git reset --merge but not necessarily with git merge --abort, so they are not only old and new syntax for the same thing.
Personally I find git reset --merge much more useful in everyday work.
git stash apply on a wrong branch, and git merge --abort did nothing (no MERGE_HEAD), while git reset --merge did the trick.
git merge --abort is the new command for git reset --merge and I ran into the same issue as @geomaster this was super helpful thanks!
Assuming you are using the latest git,
git merge --abort
If using latest Git,
git merge --abort
else this will do the job in older git versions
git reset --merge
or
git reset --hard
git version 2.31.1, that was released later than this comment so I consider it "latest", only git reset --hard worked, and the rest didn't.
There are two things you can do first undo merge by command
git merge --abort
or
you can go to your previous commit state temporarily by command
git checkout 0d1d7fc32
Sourcetree
If you not commit your merge, then just double click on another branch (=checkout) and when sourcetree ask you about discarding all changes then agree
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- Undoing a git rebase
- How do I resolve merge conflicts in a Git repository?
- How do I reset or revert a file to a specific revision?
- What is the difference between 'git pull' and 'git fetch'?
- How do I undo 'git add' before commit?
- How do I delete a Git branch locally and remotely?
- Undo a Git merge that hasn't been pushed yet
- How do I safely merge a Git branch into master?
- How do I rename a local Git branch?
git reset --mergeeven in more recent versions. I've hadgit merge --aborterror out (making no changes) wheregit reset --mergesucceeds (and does the right thing) in git 2.2.1.git merge --abortfollowed bygit reset --mergewhen having automerge conflict from popping my stash.git merge --abortworks for me, however I found myself in a situation where I checked out in a detached HEAD state, and one of my files had a "both modified" state. I wanted to discard everything and get back to a branch, I had togit reset --hard,git merge --aborttold me there was no merge to abort, (MERGE_HEAD missing).git merge --abortisn't able to bring you back your previous state, and in that case the "older syntax"git reset --harddoes the trick.