Avoid merge conflicts in NEWS file

by using the `union` merge strategy. See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
tidyverse · 3aeaa1f76eb47b5300f390b20258dd28aaab5986 · krlmlr committed Feb 25, 2014 · Feb 25, 2014 · 3aeaa1f
1 parent 1da88f3
commit 3aeaa1f76eb47b5300f390b20258dd28aaab5986
Unified Split

Showing with 2 additions and 0 deletions.

+1 −0 .Rbuildignore

+1 −0 .gitattributes
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,3 +2,4 @@ visual_test
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
+^/\.gitattributes$
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS merge=union