Skip to content

Commit eec9e69

Browse files
committed
add jsonc and lockfile config
1 parent d66b614 commit eec9e69

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

.gitattributes

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Don't allow people to merge changes to these generated files,
2+
# because the result may be invalid.
3+
pnpm-lock.yaml merge=binary
4+
shrinkwrap.yaml merge=binary
5+
npm-shrinkwrap.json merge=binary
6+
yarn.lock merge=binary
7+
8+
# Visual Studio Code JSON config files use JavaScript-style code comments. The rule below prevents pedantic
9+
# syntax highlighters such as GitHub's from highlighting these comments as errors. Your text editor
10+
# may also require a special configuration to allow comments in JSON.
11+
#
12+
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
13+
#
14+
*.json linguist-language=JSON-with-Comments

0 commit comments

Comments
 (0)