Use merge=union for yaml files so we have less merge conflicts (gatsbyjs#12851)

KyleAMathews · web-flow · commit dde25714f5db · 2019-03-25T17:49:19.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,8 @@
 * text=auto eol=lf
 
+/docs/sites.yml merge=union
+/docs/starters.yml merge=union
+
 # These files are binary and should be left untouched
 *.png binary
 *.jpg binary
