Repository navigation
pr:review --conflicts-ok: admission defers conflicts to the merge train's drivers - #191
Merged
Merged
Conversation
…usts GitHub's CONFLICTING, which ignores the merge drivers #190's dragon-sorted driver (and dragon-floor, dragon-generated) merge PRs that GitHub's plain text merge calls CONFLICTING, so admission failed #142 although it merges cleanly onto master. Before its build the driver now passes --conflicts-ok: a CONFLICTING head is judged as UNKNOWN, and the merge train, which merges with the drivers, fails a real conflict at merge.
Commands: pnpm regen
thejackshelton
added a commit
that referenced
this pull request
Oct 5, 2026
thejackshelton
added a commit
that referenced
this pull request
Oct 6, 2026
…st) into inl1a-lowering. hit-capture-identity.test.ts takes master's registered-fixture check and keeps INL1a's: no file beyond the base belongs to a base fixture (now judged by fixtureOf, which knows the ~ixN and #N suffixes). glyph-clearance-pins.json keeps both sides' entries. rt-animator.ts patchChild (master's replaced-leaf patch) takes INL1a's inline children and passes them through unchanged, as INL1a's patchBox did
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.
GitHub works out mergeability with a plain text merge that ignores our merge drivers (
dragon-generated,dragon-floor, and #190'sdragon-sorted). So it reports CONFLICTING for PRs those drivers merge cleanly. #142 failed landing admission this way atreview-before, although it merges cleanly onto master with the drivers.pr:review --conflicts-ok: a CONFLICTING head is judged as UNKNOWN (judgedHeadin pr-review-vouch.ts), and a note goes to stderr. Without the flag, nothing changes.land.tsreview-before: passes--conflicts-ok. The merge train, which merges with the drivers, still fails a real conflict atmerge. CI is still required: a conflicting PR still gets its push-eventchecksrun, and the landing commit's CI is required as before.pr-reviewstep at publish time is unchanged. By then the branch is the landing commit, so it isn't conflicting.Tests:
pr-review.test.ts+land.test.ts141/141 (new judgedHead test).pnpm typecheckpasses.🤖 Generated with Claude Code