diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..1addbfe52
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+package-lock.json   -diff -merge
+package-lock.json    linguist-generated=true