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

Answers


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?


Need Your Help

Blackberry image background repeat

blackberry java-me background

In my app i am setting bitmap image of verticalFieldManager but it is repeating. For setting image i am using

Real-time monitoring of intermittent binary data

linux terminal binary buffer monitoring

Context: monitor a low-volume, intermittent stream from a program