From 45b3b5df5cf3bb52169ab9b9631e8315db63d559 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Mon, 15 Jul 2019 17:40:05 -0230 Subject: [PATCH] Show lockfile diffs on GitHub (#6857) --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) 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