opensourcemirror
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Christoph Wurst 2022-11-17 12:29:54 +01:00
parent f021172eab
commit 5ae8f6326c
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1,2 +1,2 @@
/dist/* binary
/package-lock.json binary
/package-lock.json merge=binary