I ran into a merge conflict How can I abort the merge

Question

I used git pull and had a merge conflict   unmerged     widget html erb  You are in the middle of a conflicted merge    I know that the other version of the file is good and that mine is bad so all my changes should be abandoned  How can I do this

User · Answer

For git  gt   1 6 1  git merge --abort  For older versions of git  this will do the job  git reset --merge  or git reset --hard

User · Answer

Since your pull was unsuccessful then HEAD  not HEAD   is the last  valid  commit on your branch   git reset --hard HEAD   The other piece you want is to let their changes over-ride your changes     Older versions of git allowed you to use the  theirs  merge strategy   git pull --strategy theirs remote branch   But this has since been removed  as explained in this message by Junio Hamano  the Git maintainer    As noted in the link  instead you would do this   git fetch origin git reset --hard origin

User · Answer

I think it s git reset you need   Beware that git revert means something very different to  say  svn revert - in Subversion the revert will discard your  uncommitted  changes  returning the file to the current version from the repository  whereas git revert  undoes  a commit   git reset should do the equivalent of svn revert  that is  discard your unwanted changes

User · Answer

An alternative  which preserves the state of the working copy is   git stash git merge --abort git stash pop   I generally advise against this  because it is effectively like merging in Subversion as it throws away the branch relationships in the following commit

User · Answer

In this particular use case  you don t really want to abort the merge  just resolve the conflict in a particular way   There is no particular need to reset and perform a merge with a different strategy  either  The conflicts have been correctly highlighted by git and the requirement to accept the other sides changes is only for this one file   For an unmerged file in a conflict git makes available the common base  local and remote versions of the file in the index   This is where they are read from for use in a 3-way diff tool by git mergetool   You can use git show to view them     common base  git show  1  widget html erb     ours  git show  2  widget html erb     theirs  git show  3  widget html erb   The simplest way to resolve the conflict to use the remote version verbatim is   git show  3  widget html erb  gt  widget html erb git add  widget html erb   Or  with git    1 6 1   git checkout --theirs  widget html erb

User · Answer

Comments suggest that git reset --merge is an alias for git merge --abort  It is worth noticing that git merge --abort is only equivalent to git reset --merge given that a 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  They are not only old and new syntax for the same thing   Personally  I find git reset --merge much more powerful for scenarios similar to the described one  and failed merges in general

User · Answer

You can either abort the merge step  git merge --abort  else you can keep your changes  on which branch you are  git checkout --ours file1 file2      otherwise you can keep other branch changes git checkout --theirs file1 file2

User · Answer

I found the following worked for me  revert a single file to pre-merge state    git reset  currentBranchIntoWhichYouMerged  --  fileToBeReset

User · Answer

git merge --abort      Abort the current conflict resolution process  and try to reconstruct   the pre-merge state       If there were uncommitted worktree changes present when the merge   started  git merge --abort will in some cases be unable to   reconstruct these changes  It is therefore recommended to always   commit or stash your changes before running git merge       git merge --abort is equivalent to git reset --merge when   MERGE HEAD is present    http   www git-scm com docs git-merge

User · Answer

Since Git 1 6 1 3 git checkout has been able to checkout from either side of a merge   git checkout --theirs  widget html erb

User · Answer

If you end up with merge conflict and doesn t have anything to commit  but still a merge error is being displayed  After applying all the below mentioned commands    git reset --hard HEAD git pull --strategy theirs remote branch git fetch origin git reset --hard origin   Please remove       git index lock   File  cut paste to some other location in case of recovery  and then enter any of below command depending on which version you want   git reset --hard HEAD git reset --hard origin   Hope that helps

User · Answer

Sourcetree Because you not commit your merge  then just double click on another branch  which mean checkout it  and when sourcetree ask you about discarding all changes then agree    Update I see many down-votes but any commet    I will left this answer which is addressed for those who use SourceTree as git client  as I - when I looking for solution for question asked by OP

User · Answer

If your git version is    1 6 1  you can use git reset --merge   Also  as  Michael Johnson mentions  if your git version is    1 7 4  you can also use git merge --abort   As always  make sure you have no uncommitted changes before you start a merge   From the git merge man page  git merge --abort is equivalent to git reset --merge when MERGE HEAD is present   MERGE HEAD is present when a merge is in progress   Also  regarding uncommitted changes when starting a merge   If you have changes you don t want to commit before starting a merge  just git stash them  before the merge and git stash pop after finishing the merge or aborting it

[git] I ran into a merge conflict. How can I abort the merge?

Examples related to git

Examples related to version-control

Examples related to git-merge

Examples related to git-merge-conflict