fix(conflict): resolve generated lock files deterministically, never via LLM#81
Merged
Merged
Conversation
…via LLM Ports vortex-dispatch #89. The conflict resolver was sending machine-generated lock files (package-lock.json, etc.) to the LLM, which on a large file blows the pipeline timeout. isGeneratedLockFile now recognizes them and resolves via git checkout --ours (story branch version, same policy as binary conflicts), emitting a lock_file_deterministic event; post-merge build/QA validates deps. Unit test for classification. Build + full suite green.
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.
Ports vortex-dispatch #89. Lock files (package-lock.json, yarn.lock, go.sum, …) are resolved with
git checkout --oursinstead of being sent to the LLM (which blew the pipeline timeout). Unit test; full suite green.🤖 Generated with Claude Code