diff --git a/.gitattributes b/.gitattributes
index 6313b56c5..20f58513c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,4 @@
 * text=auto eol=lf
+
+# Handle as a text file but merge as binary.
+package-lock.json merge=binary