Skip to content

Commit 845f502

Browse files
maxholmanclaude
andcommitted
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

File tree

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Force merge conflicts on lock files so they are always regenerated, never
2+
# silently auto-merged with potentially wrong dependency resolution.
3+
Cargo.lock merge=binary

0 commit comments

Comments
 (0)