-
Notifications
You must be signed in to change notification settings - Fork 107
Expand file tree
/
Copy path.gitattributes
More file actions
30 lines (26 loc) · 1.25 KB
/
Copy path.gitattributes
File metadata and controls
30 lines (26 loc) · 1.25 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
# Lockfiles for package managers we don't use must never be text-merged: a bad
# merge silently corrupts them, so keep them as hard conflicts.
shrinkwrap.yaml merge=binary
npm-shrinkwrap.json merge=binary
yarn.lock merge=binary
# pnpm-lock.yaml is regenerated on merge by a local driver that ships with the
# repo (registered by ts/tools/scripts/setup-merge-driver.mjs on `pnpm install`).
# Hosts without the driver (e.g. GitHub's server-side merges and the merge
# queue) don't recognize the name and fall back to git's normal 3-way text
# merge; CI's `pnpm install --frozen-lockfile` then catches any bad merge.
pnpm-lock.yaml merge=pnpm-lock
# Autogenerated package READMEs carry a commit-stamped footer, so every branch
# regenerates a different last line and they conflict constantly. Keep our copy
# on merge (the local keep-ours driver); the docs pipeline regenerates them.
# Where the driver isn't registered the name is unknown and git falls back to a
# text merge, and the heal-generated-files workflow clears the leftover conflict.
README.AUTOGEN.md merge=keep-ours
# Make text consistently using LF
* text eol=lf
# Non-text files
*.png -text
*.jpg -text
*.gif -text
*.pdf -text
*.bin -text
*.db -text