The operation could not be performed because "PROJECTNAME" has one or more tree conflicts

Question

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

Answer 1

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?

Answer 2

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 :

1. Check which directory in your local work repository differs from the server repository.
2. If the local repository has extra directory Delete(local) -> update ->OK , if the local repository lacks of something and the extra elements in server is needless, Delete (server) -> update. NOTE After this the tree conflict is not existing any more.

Hope helps.