.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
Written by Kemal Taskin
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Ios
Authors
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#