Abort a Git Merge

Question

I am working on a project using Git as the VCS  I got a branch xyz cut from the mainline branch of master  After working for a while  I committed my code and took a pull of the branch mainline   The pull was fine  I then merged the code with master  After the merge  there were problems in certain files  I have not committed the code after merging  Can someone please guide as to how I can abort this merge and bring my branch where I am working currently to the state where it was before I merged it

User · Accepted Answer

as long as you did not commit you can type  git merge --abort   just as the command line suggested

User · Answer

Truth be told there are many  many resources explaining how to do this already out on the web   Git  how to reverse-merge a commit   Git  how to reverse-merge a commit   Undoing Merges  from Git s blog  retrieved from archive org s Wayback Machine   So I guess I ll just summarize some of these    git revert  lt merge commit hash gt  This creates an extra  revert  commit saying you undid a merge git reset --hard  lt commit hash  before  the merge gt  This reset history to before you did the merge  If you have commits after the merge you will need to cherry-pick them on to afterwards    But honestly this guide here is better than anything I can explain  with diagrams

User · Answer

If you do  git status  while having a merge conflict  the first thing git shows you is how to abort the merge

[git] Abort a Git Merge

Examples related to git

Examples related to git-merge