Commit 5fc581e
committed
feat: protect package-lock.json from fork merge conflicts
Add package-lock.json to .gitattributes with merge=ours strategy.
This prevents lock file conflicts when merging PRs from forks that
have run the cleanup script (which removes @anthropic-ai/sdk and
@octokit/rest from package.json).
Also updated README to explain how package-lock.json is handled
during PR merges and what contributors should do when adding new
dependencies.1 parent 35b1811 commit 5fc581e
2 files changed
+18
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
402 | 402 | | |
403 | 403 | | |
404 | 404 | | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
405 | 418 | | |
406 | 419 | | |
407 | 420 | | |
| |||
0 commit comments