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
I was in trouble with this problem. It often happens when I remove or change the directory
of the project .For example, when I move one directory into another existing directory,both of the directory are real folder the warning will exist.
In fact the meaning of tree conflict
is that the directory level in your work repository is not same as it was on server.
It's my way to resolve this problem :
NOTE
After this the tree conflict is not existing any more.Hope helps.