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 branch I was merging into. The problem is it has a space in the name:
TestService/TestService copy-Info.plist
How do I remove that file? thanks!
The same way you’d use
rmto remove such a file: quote the name:or
or
Depending on your shell and the names of other files, tab completion may help with this. Typing
$ git rm TeTabwill likely complete the directory name:
$ git rm TestingService/Then typing part of the file name and another tab:
$ git rm TestService/TeTabwill complete the filename, including an inserted
\to escape the space character:$ git rm TestService/TestService\ copy-Info.plistBut tab completion usually only expands a unique prefix based on all the files available, so this may or may not work.