feat: disable git merging shrinkwrap files (#43)

iamturns · web-flow · commit 97d428b0f1a3 · 2019-01-30T19:37:55.000+11:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,8 @@
+# Disable shrinkwrap merging as results may be invalid.
+npm-shrinkwrap.json merge=binary
+shrinkwrap.yaml merge=binary
+yarn.lock merge=binary
+
 # Source: https://github.com/alexkaratarakis/gitattributes/blob/master/Web.gitattributes
 #
 ## GITATTRIBUTES FOR WEB PROJECTS
diff --git a/templates/1-base/.gitattributes.template b/templates/1-base/.gitattributes.template
@@ -1,3 +1,8 @@
+# Disable shrinkwrap merging as results may be invalid.
+npm-shrinkwrap.json merge=binary
+shrinkwrap.yaml merge=binary
+yarn.lock merge=binary
+
 # Source: https://github.com/alexkaratarakis/gitattributes/blob/master/Web.gitattributes
 #
 ## GITATTRIBUTES FOR WEB PROJECTS

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
	`1`	`+# Disable shrinkwrap merging as results may be invalid.`
	`2`	`+npm-shrinkwrap.json merge=binary`
	`3`	`+shrinkwrap.yaml merge=binary`
	`4`	`+yarn.lock merge=binary`
	`5`	`+`
`1`	`6`	`# Source: https://github.com/alexkaratarakis/gitattributes/blob/master/Web.gitattributes`
`2`	`7`	`#`
`3`	`8`	`## GITATTRIBUTES FOR WEB PROJECTS`