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:

T         


        

Answer 1

For me this error occurred when Xcode got confused on which branch the project was currently on. So I solved it by switching the branch to master and then back to the former branch again. So, try this simple fix first.