The operation could not be performed because “PROJECTNAME” has one or more tree conflicts
I am using Git and when I tried to pull a newer development branch with my current branch using XCode's source control menu I received this error message:
The operation could not be performed because "ProjectName" has one or more tree conflicts.
How do I resolve these tree conflicts? Thanks
There is a conflict in the project file you need to pull using the command line or a GUI tool like SourceTree (Free) and manually resolve the conflict in a text editor or diff tool.
See also:How to use Git properly with XCode?