Permalink
Browse files

Hopefully make it so conflicts in the xcode project files are automat…

…ically resolved.

This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
  • Loading branch information...
1 parent 73ec38c commit d9010d186f322d9a75cf12faa0cf126b035a6fb1 @dak180 dak180 committed Feb 3, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 .gitattributes
View
@@ -1,3 +1,3 @@
-*.pbxproj -crlf -merge
-*.xcworkspacedata -crlf -merge
-*.xcscheme -crlf -merge
+*.pbxproj -crlf merge=ours
+*.xcworkspacedata -crlf merge=ours
+*.xcscheme -crlf merge=ours

0 comments on commit d9010d1

Please sign in to comment.