2021-08-25 22:47:06 +03:00
|
|
|
# Don't allow people to merge changes to these generated files, because the result
|
|
|
|
|
# may be invalid. You need to run "rush update" again. Also make GitHub collapse
|
|
|
|
|
# the diff by default for generated files.
|
2023-06-19 19:55:18 +03:00
|
|
|
pnpm-lock.yaml merge=binary linguist-generated=true
|
|
|
|
|
shrinkwrap.yaml merge=binary linguist-generated=true
|
|
|
|
|
npm-shrinkwrap.json merge=binary linguist-generated=true
|
|
|
|
|
yarn.lock merge=binary linguist-generated=true
|
|
|
|
|
common/config/rush/repo-state.json merge=binary linguist-generated=true
|
2021-08-25 22:47:06 +03:00
|
|
|
|
|
|
|
|
# docs/spec.html is also generated and not worth resolving line by line or
|
2024-05-08 00:02:14 +03:00
|
|
|
# reviewing or having its diff uncollapsed on GitHub. On conflict, pick either
|
2021-08-25 22:47:06 +03:00
|
|
|
# side and rebuild to regenerate.
|
|
|
|
|
docs/spec.html merge=binary linguist-generated=true
|
|
|
|
|
|
|
|
|
|
# Use unix line endings always, even on Windows
|
|
|
|
|
* text=auto eol=lf
|
|
|
|
|
|
|
|
|
|
# Allow comments in JSON in GitHub rendering
|
|
|
|
|
*.json linguist-language=JSON-with-Comments
|
