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 <christoph@winzerhof-wurst.at>

diff --git a/.gitattributes b/.gitattributes
index ca7762f3ab26101aed822b68e9e0ae915db500f3..8073c8cd0198aa24f25ad5dfa1b2027ca64ed9cc 100644 (file)
--- 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