diff --git a/.gitattributes b/.gitattributes
index fe25383fc..d5f1fc261 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
+* text=auto eol=lf
+
 test/assets/*.app/** merge=binary
+
+# Handle as a text file but merge as binary.
+package-lock.json merge=binary