aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index a19ade077..ae439a637 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
CHANGELOG.md merge=union
+
+# Reviewing the lockfile contents is an important step in verifying that
+# we're using the dependencies we expect to be using
+package-lock.json linguist-generated=false
+yarn.lock linguist-generated=false