mirror of
https://github.com/nextcloud/server.git
synced 2026-02-03 20:41:22 -05:00
5ae8f6326c
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>
2 lines
47 B
Text
2 lines
47 B
Text
/dist/* binary
|
|
/package-lock.json merge=binary
|