fix(conflict): reject resolver commentary instead of writing it to the file#83
Merged
Merged
Conversation
…e file
Port of the VXD fix. When the conflict-resolution model returns prose with NO
fenced block ("Conflict resolved. Kept both sides…"), extractResolvedFileContent
returns the prose and it gets written, destroying the file. looksLikeResolverChatter
guards both the Senior and Tech-Lead paths so resolution fails (escalate/abort)
instead of corrupting the file. Updated one test fixture whose placeholder
"resolved content" tripped the new guard. 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.
Port of VXD #93. Guards both resolution paths against prose-only LLM replies (no fenced block) that would otherwise be written verbatim and destroy the file. Full suite green.