Permalink
Browse files

merge strategies

  • Loading branch information...
1 parent be23bbf commit 7db9095c551f1e7a96de80f79a1db5283d217249 @Diablohu committed Jul 16, 2015
Showing with 5 additions and 0 deletions.
  1. +5 −0 .gitattributes
View
@@ -15,3 +15,8 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
+
+# Merge Strategies
+app/main.html merge=ours
+app/assets/* merge=theirs
+app/assets/*.* merge=theirs

0 comments on commit 7db9095

Please sign in to comment.