From 5ae8f6326c6790c95690ebf82602571ed3d28ab8 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Thu, 17 Nov 2022 12:29:54 +0100 Subject: [PATCH] Do not auto merge package-lock.json, but treat as text file If package-lock is specified to be a binary file, it becomes impossible to diff any changes. Since we only want to prevent git from merging changes in the lockfile, we can be more specific and tell it that binary handling is only required as merge strategy. [skip ci] Signed-off-by: Christoph Wurst --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index ca7762f3ab2..8073c8cd019 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ /dist/* binary -/package-lock.json binary \ No newline at end of file +/package-lock.json merge=binary -- 2.39.5