diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-11-17 12:29:54 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-11-17 12:32:03 +0100 |
| commit | 5ae8f6326c6790c95690ebf82602571ed3d28ab8 (patch) | |
| tree | 6b4ec0d6b0a19d60fc26be9675fe5a208ac52324 | |
| parent | f021172eab79b6e1adaa1950009dd6446f1ddb64 (diff) | |
| download | nextcloud-server-5ae8f6326c6790c95690ebf82602571ed3d28ab8.tar.gz nextcloud-server-5ae8f6326c6790c95690ebf82602571ed3d28ab8.zip | |
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>
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
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 |