.xccheckout had a tree conflict

git version-control xcode5 bitbucket shared-data
timonroe picture timonroe · May 8, 2014 · Viewed 6.9k times · Source

Using Xcode 5.x and Git, we did a commit on this file: MyProjectName.xccheckout. We then pushed this commit to our central repo. Now, when someone else on the team does a Pull we get the error: "MyProjectName.xccheckout had a tree conflict."

There are several posts on this topic and appears the correct thing to do is to commit this file. But now that we've done this, how do we handle the conflict?

This post Should *.xccheckout files in Xcode5 be ignored under VCS? covers the same issue but don't see how they resolved the conflict.

  • Update: I manually merged the changes from the central repo down to my local copy, then tried to do the Pull again but got the same error. I've also noticed the values in this file change from time to time but not sure what's causing that.

  • Update: Here's an example of the value that's changing in the file:
    IDESourceControlProjectIdentifier
    3869BFC7-FD51-432F-A70B-CE2ADC0CDF1F

Answer

Doro picture Doro · May 30, 2014

Have you try to remove this file from git by

rm YourProjectName.xcodeproj/project.xcworkspace/xcshareddata/YourProjectName.xccheckout

Next step is to commit 

git commit -m "remove YourProjectName.xccheckout"

Push again from machine where this file was tracked first.

This action will delete .xccheckout from repo and other team members can pull.

Related questions

Should *.xccheckout files in Xcode5 be ignored under VCS?

Apple has introduced a new project-related type of file in Xcode 5: "xccheckout". This file is located in the ".xcodeproj/project.xcworkspace/xcshareddata/" directory, and it seems that it is related to the project's version control system. An example file is …

Read More
XCode source control: view changes for one file

Is it possible to view a "timeline" (history) for a selected file for like 50 commits? I mean changes made to this particular file and and view commits when they were made and users who changed them? I know Xcode got …

Read More
How do I undo the most recent local commits in Git?

I accidentally committed the wrong files to Git, but didn't push the commit to the server yet. How can I undo those commits from the local repository?

Read More