chore(release): sync main ancestry into dev#282
Merged
Conversation
Execute Python type validation with repo-local mypy or pyright instead of returning deferred coverage after tool discovery. Fixes #208
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
2 participants
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.
Summary
Merge the current
mainrelease commit intodevso the mandateddev → mainpromotion PR can merge cleanly.Evidence
ffb2e7f3dad821e354317fe62124b1308d642744, main8ed629c6e4ac1a6a858cbcc58e063a07d070a54e8c8c2f0aea915332de3b7efac592c532660e2c438c8c2f0aea915332de3b7efac592c532660e2c43The conflict came from equivalent Python type-checker work committed separately on
mainanddev, plus an earlier stale local-main ancestry merge. Conflict resolution preserves the newer, already-greendevfiles byte-for-byte while recording the realmainparent.