iOS-Development-With-Git .gitignore and .gitattributes for best team merging. Without these many errors can occur. Thes files should fix pbx merging issues along with any cocoa pods issues and general user files.