Git merge error commit is not possible because you have unmerged files

Question

I forgot to git pull my code before editing it  when I committed the new code and tried to push  I got the error  quot push is not possible quot   At that point I did a git pull which made some files with conflict highlighted  I removed the conflicts but I don t know what to do from here  I tried to git commit again but it says the  quot commit is not possible because you have unmerged files quot    error  Committing is not possible because you have unmerged files

User · Accepted Answer

If you have fixed the conflicts you need to add the files to the stage with git add  filename   then commit as normal

User · Answer

So from the error above  All you have to do to fix this issue is to revert your code   git revert HEAD  then git pull and then redo your changes  then git pull again and was able to commit or merge with no errors

User · Answer

You can use git stash to save the current repository before doing the commit you want to make  after merging the changes from the upstream repo with git stash pop   I had to do this yesterday when I had the same problem

User · Answer

You need to do two things  First add the changes with  git add   git stash    git checkout  lt some branch gt    It should solve your issue as it solved to me

User · Answer

Since git 2 23  August 2019  you now have a shortcut to do that  git restore --staged  filepath   With this command  you could ignore a conflicted file without needing to add and remove that   Example    gt  git status          Unmerged paths       use  git add  lt file gt      to mark resolution        both modified    file ex   gt  git restore --staged file ex   gt  git status          Changes not staged for commit       use  git add  lt file gt      to update what will be committed       use  git restore  lt file gt      to discard changes in working directory        modified    file ex

User · Answer

This error occurs when you resolve the conflicts but the file still needs to be added in the stage area  git add   would solve it  Then  try to commit and merge

User · Answer

I ve had a similar issue which boiled down to removing files under  unmerged paths   Those files had to be removed using git rm

[git] Git merge error "commit is not possible because you have unmerged files"

Examples related to git

Examples related to git-merge