Skip to content

Instantly share code, notes, and snippets.

@sebk
Created April 3, 2014 06:55
Show Gist options
  • Save sebk/9949483 to your computer and use it in GitHub Desktop.
Save sebk/9949483 to your computer and use it in GitHub Desktop.
.gitattributes to handle pbxproj
# http://stackoverflow.com/questions/1549578/git-and-pbxproj
# http://stackoverflow.com/a/18275082/470964
*.pbxproj -crlf -diff -merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment