CODEWITHSUNDEEP
iphonesvnsdkconflictpbxproj
mobibob
mobibob

Reputation: 8794

Under iPhone SDK are you supposed to checkin project.pbxproj into source control?

I have been using SCM for myself, but now I am working in team-of-two :) It appears that we are having conflicts on project.pbxproj and I think it is because that file should not be put under source control. Is that file for personalizing one's environment, or does it have vital settings for build, etc.?

I want to delete it from SVN.

Using XCode 4.x with SVN under TeamForge.

Upvotes: 2

Views: 273

Answers (1)

omz
omz

Reputation: 53561

You should keep the .pbxproj file under version control. It basically contains the project's structure in Xcode; groups, references to files, build settings, etc. Personal settings are stored in xcuserdata.

It's quite common to have conflicts there, it's just an xml file though, so merging is relatively easy (though tedious).

Upvotes: 3

Related Questions