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
If you use Ubuntu sometimes you need to use git rm --cached -r "TestService/TestService copy-Info.plist"
git rm --cached -r "TestService/TestService copy-Info.plist"