This website requires JavaScript.
Explore
Help
Sign In
Mirrors
/
nextcloud
Watch
1
Star
0
Fork
0
You've already forked nextcloud
mirror of
https://github.com/nextcloud/server.git
synced
2024-07-31 20:15:57 +02:00
Code
Issues
Actions
45
Packages
Projects
Releases
Wiki
Activity
58a0740794
nextcloud
/
.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 15:15:39 +01: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 12:29:54 +01:00
/package-lock.json merge=binary
Reference in New Issue
Copy Permalink