Repository navigation
chore(git): never merge a lockfile - #2
Merged
Merged
Conversation
A lockfile merged line by line can disagree with its manifests while looking clean, so a conflicting change stops instead and is regenerated. Co-Authored-By: LLM <noreply@block65.dev>
maxholman
approved these changes
Oct 19, 2026
maxholman
approved these changes
Oct 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Git no longer merges a lockfile line by line. When a branch and its base both change
pnpm-lock.yamlorCargo.lock, the merge stops at a conflict, so the lockfile is regenerated by its package manager instead of being stitched together into something that can disagree with the manifests. csp already has the same rule.Verified by hand:
git check-attr mergereportsunsetfor every lockfile in the repo, nested ones included. In a scratch repo, two edits to different lines of a lockfile merge silently without the rule and stop at a conflict with it.