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

this answer is :

git commit -i -m "message"