Git error on commit after merge - fatal: cannot do a partial commit during a merge
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 with git commit file.php -m "message" I get the error:
fatal: cannot do a partial commit during a merge.
I had the same issue before and using -a in commit worked perfectly. I think it's not the perfect way because I don't want to commit all changes. I want to commit files separately with separate comments. How can I do that? Why doesn't git allow users to commit files separately after a merge? I could not find a satisfactory answer to this problem.
I found that adding "-i" to the commit command fixes this problem for me. The -i basically tells it to stage additional files before committing. That is:
git commit -i myfile.php
git commit -am 'Conflicts resolved'
This worked for me. You can try this also.
You can use git commit -i for most cases but in case it doesn't work
You need to do git commit -m "your_merge_message". During a merge conflict you cannot merge one single file so you need to
- Stage only the conflicted file (
git add your_file.txt) git commit -m "your_merge_message"