Merging Xcode project files

Question

There are often conflicts in the Xcode project file (Project.xcodeproj/project.pbxproj) when merging branches (I\'m using git). Sometimes it\'s easy, but at times I end up w

Answer 1

You might want to try https://github.com/simonwagner/mergepbx/

It is a script that will help you to merge Xcode project files correctly. Note that it is still alpha.

Disclaimer: I am the author of mergepbx.