Permalink
Browse files

Use merge=union attribute to help resolve conflicts in project and so…

…lution files
  • Loading branch information...
1 parent bb99981 commit 0d1f1fc47b2e27ede827720560d0211b921ea769 @hazzik hazzik committed May 18, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 .gitattributes
View
@@ -1 +1,6 @@
-* -text
+* -text
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+*.sln merge=union

0 comments on commit 0d1f1fc

Please sign in to comment.