Svn conflict xcode project file while working in a team

Question

I work in a team that develops an application for the iPhone (about 7 people). We use SVN to manage the iPhone source code, we continue to encounter conflicts with the xcode project file and the nib file for the iPhone. I think a question was asked about this problem: How to merge conflicts (project.pbxproj file) in Xcode using svn? . I want to ask if anyone has a suitable solution for this. Since our team is quite decent in size (7 people), manually resolving the conflict in the xcode project file every time someone changes the code, or adding a new object to the nib file is a huge departure from performance. Did Apple engineers ever think about this when they wrote their own iPhone apps? I was looking for a satisfactory solution using Google and Bing, have not found it yet.

Thanks,

Answer 1

This is definitely a HUGE drawback with xcode. I am in a team of the same size, and here is what I do to make the process as painless as possible:

SVN Update (ALWAYS do this before checking):

• quit Xcode. The fastest way to do this is to use Alfred and type "forcequit xcode"
• "svn up" in the project folder from the command line
• If you have merge conflicts with the project file, click "edit" to open in emacs or something else
• search for "======" to find merge conflicts; delete this line as well as the lines "<lt;" and "→ →".
• save and exit. press "r" to mark the project as allowed.
• reopen the project - "open MyProject.xcodeproj /"

With a little practice, you can get this process up to a minute (I do this several times a day).

for NIB files, DO NOT WORK while someone else is working on it. There is no real way to combine them. Make your changes quickly and check immediately (there are not so many cases when 2 people have to work in the NIB file anyway anyway). For less complex views, just use them programmatically.

Answer 2

Try installing SourceGear DiffMerge . This is a merge tool that should facilitate merging of changes. Also see this post about setting up Xcode to use DiffMerge