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

To compare two Xcode projects open open FileMerge (open xcode and select Xcode (from the manu pane) --> Open developer tools --> FileMerge). now click "left" button and open xcode project main directory. click "right" button and open xcode project main directory to compare.

Now click "merge" button!

Thats it!