Git Error On Commit After Merge - Fatal: Cannot Do A Partial Commit During A Merge
I ran a git pull that ended in conflict. I resolved the conflict and everything is fine now (I used the merge tool 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.
You can use git commit -i for most cases related to the error - fatal: cannot do a partial commit during a merge 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"