How to resolve git status Unmerged paths

Question

I merged branch dog into animal   When I go to commit  I get the following  Unmerged paths   use  quot git reset HEAD  lt file gt     quot  to unstage   use  quot git add  lt file gt     quot  to mark resolution both deleted           public images originals dog ai added by them          public images original files dog ai  I had different directory names and file names in each branch   The animal branch has the changes that I want  When I go to reset the head  it doesn t work   And when I go to take any other git action  remove  checkout  etc   I get a path not found error  What commands do I need to execute to resolve this

User · Accepted Answer

All you should need to do is    if the file in the right place isn t already committed  git add  lt path to desired file gt     remove the  quot both deleted quot  file from the index  git rm --cached    public images originals dog ai    commit the merge  git commit

User · Answer

Another way of dealing with this situation if your files ARE already checked in  and your files have been merged  but not committed  so the merge conflicts are inserted into the file  is to run   git reset   This will switch to HEAD  and tell git to forget any merge conflicts  and leave the working directory as is  Then you can edit the files in question  search for the  Updated upstream  notices   Once you ve dealt with the conflicts  you can run   git add -p   which will allow you to interactively select which changes you want to add to the index  Once the index looks good  git diff --cached   you can commit  and then   git reset --hard   to destroy all the unwanted changes in your working directory

[git] How to resolve git status "Unmerged paths:"?

Examples related to git

Examples related to merge

Examples related to git-merge

Examples related to git-status