Last Updated: February 25, 2016
·
1.513K
· kemaltaskin

.gitattributes template for Xcode projects

During development you'll notice that the project.pbxproj file is always in a merge-conflict state when multiple team members have added/removed files or changed the project settings.

The following .gitattributes template will tell git to treat this file as binary. When a merge conflict occurs, git will combine the changes from both sides of the conflict.

*.pbxproj binary merge=union