]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f021172) | patch
Do not auto merge package-lock.json, but treat as text file 35225/head
authorChristoph Wurst <christoph@winzerhof-wurst.at>
Thu, 17 Nov 2022 11:29:54 +0000 (12:29 +0100)
committerChristoph Wurst <christoph@winzerhof-wurst.at>
Thu, 17 Nov 2022 11:32:03 +0000 (12:32 +0100)
commit5ae8f6326c6790c95690ebf82602571ed3d28ab8
tree6b4ec0d6b0a19d60fc26be9675fe5a208ac52324tree | snapshot
parentf021172eab79b6e1adaa1950009dd6446f1ddb64commit | diff
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>
.gitattributes diff | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server