I tried merging with the command line for a project in Xcode and I think a file needs to be removed. It is a file that exists in the branch I was merging from, but not the
Have your tried to add quotes to the filename? "TestService/TestService copy-Info.plist" I'm not 100% sure how it works with Git.
"TestService/TestService copy-Info.plist"