When using git with Xcode interface, I get the following error after pressing commit # Files and Push.
The working copy “Project” failed to commit files.
fatal: cannot do a partial commit during a merge.
I am using Xcode's Source Control. I have looked here but have not found anything that resolves the issue for Xcode's Source Control.