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

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