This website requires JavaScript.
Explore
Help
Sign In
nextcloud
/
server
mirror of
https://github.com/nextcloud/server
Watch
0
Star
0
Fork
You've already forked server
0
Code
Issues
Releases
Wiki
Activity
064fa10ecf
server
/
.gitattributes
3 lines
47 B
Plaintext
Raw
Normal View
History
Unescape
Escape
Update .gitattribute file Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-01-13 14:15:39 +00:00
/dist/* binary
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>
2022-11-17 11:29:54 +00:00
/package-lock.json merge=binary