I stopped having merge conflicts with pbxproj files - ever - once I started making use of this tool in my projects: https://github.com/WebKit/webkit/blob/maste

I stopped having merge conflicts with pbxproj files - ever - once I started making use of this tool in my projects: https://github.com/WebKit/webkit/blob/master/Tools/Scripts/sort-Xcode-project-file https://github.com/WebKit/webkit/blob/master/Tools/Scripts/s... It can be run while Xcode is open; it'll just reset the tree view. It basically alphabetizes everything, so there is one canonical ordering to items that you add to the project.