Repository navigation
type conflicts: 21 new conflicted names read and classified (16 DISTINCT, 5 DRIFT) (Closes #11663) - #11665
Merged
gHashTag merged 1 commit intoOct 22, 2026
Conversation
…NCT, 5 DRIFT) (Closes #11663) Every conflicted name in the tree now has a written verdict; tri types classified reports 128 judged, no stale rows, no unjudged. DRIFT rows are the uart_bridge v1/v2 family (LedState, RxState, TxState), the two bogatyr lineages (BogatyrResult), and the gft JTAG payload family (JtagData).
gHashTag
enabled auto-merge (squash)
October 22, 2026 17:01
This was referenced Oct 22, 2026
Merged
This was referenced Oct 22, 2026
Contributor
gHashTag
deleted the
ledger/type-conflicts-classify-21-Gaia-MacBook-Air
branch
October 26, 2026 03:47
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.
Closes #11663. The bless in #11664 absorbed 21 new conflicted names into docs/reports/type_conflicts.json, but the CI check 'Every conflicted type name has a written verdict' then reported 21 UNJUDGED names: classification lags. This reads each new conflict's two definitions (both sites opened, field lists compared) and writes the verdicts:
verdicts in type_conflicts_classified.json: DRIFT 65, DISTINCT 63 (=128). tri types classified cross-check passes: no UNJUDGED, no STALE.