fatal: cannot do a partial commit during a merge in Git

Adding -i to the commit command fixes this problem.

git commit -i filename.php

Ex: git commit -i filename.php -m"COMMIT MESSAGE"