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

I had a similar issue. So I opened a terminal-windows and changed to the directory, verified my branch was clean with a git status, changed to master using git checkout master and merged my branch with git merge push-notifications. The Git Branching - Basic Branching and Merging page explains it in detail.