Git error on commit after merge - fatal: cannot do a partial commit during a merge

Question

I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also).

When I commit the resolved file

Answer 1

1. go to your project directory
   2. display hidden files (.git folder will appear)
   3. open .git folder
   4. remove MERGE_HEAD
   5. commit again
   6. if git told you that git is locked go back to .git folder and remove index.lock
   7. commit again everything will work fine this time .