Commit 845f502
chore: add .gitattributes to force Cargo.lock merge conflicts
Marks Cargo.lock as binary for merge purposes so git never silently
auto-merges it — forces regeneration on conflict instead.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent 8c98e35 commit 845f502
2 files changed
Lines changed: 90 additions & 81 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
0 commit comments