Repository navigation
Conversation
Quest-Claim: eac64b24020188db
When the quest resolve driver's list merge leaves a Required section with nothing but blank lines, drop the heading with it, as quest rm does, so the merged tree passes quest check. Other empty list sections stay for quest check to report. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A conflict whose ours side has no lines left no trace in the blank-body check, so the heading went even though resolving that conflict could put an entry back under it. Track every remaining conflict's position instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated
changed the title
kixelated
marked this pull request as ready for review
October 31, 2026 15:29
|
Warning Review limit reachedYou've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Next included review available in 18 minutes. View limit details
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. |
This branch has not been deployed
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
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.
Finishes quest/m0/required-heading.md: when the
quest resolvedriver's list merge empties aRequiredlist, the## Requiredheading goes too, so the merged tree passesquest check(the moq-dev/moq#7251 failure).Changes
src/core/merge.ts:resolveListsnotes each conflict it resolves to an emptyRequiredlist, thendropEmptyRequiredremoves that section's heading and blank body when the section holds nothing else and no conflict remains in it. A blank line the removal leaves doubled goes too, asquest rm(dropinsrc/core/edit.ts) does.Itemnow carries its section so the resolution knows which list it emptied.test/resolve.test.ts: both sides each removing one of the last two entries, withRequiredlast and before## Related; beside a prose conflict left unresolved; a conflict left inside the section (including one with no ours lines) keeps the heading; an emptiedRelatedkeeps its heading andquest checkreports it.quest/m0/README.md.Choices made without asking
Requiredis dropped, per the quest's Plan; emptiedRelated/Closesstay forquest check, which already reports them (src/core/rules.ts).Requiredthat was already empty on the inputs.merge.tsrather than sharingdropfromedit.ts: the merge works on chunks with conflicts interleaved, whichdrop's whole-text interface does not fit.Checks
just check: passjust test(viaquest gate): 726 passed, 2 skipped; 426 passedquest check --base origin/main: 69 documents okReview
quest review), session01a19290-0251-7c53-ba00-a735cc26b575Follow-ups
🤖 Generated with Claude Code
(Written by Claude Opus 5.5)