fix(git): restore continuous conflict review and guard resolution - #235
Merged
Merged
Conversation
This was referenced Oct 1, 2026
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.
Change
Verification
pnpm preflight:full: passed (static, signed release plugin-index assets, full unit/component/coverage, application build, Swift tests, native addon build).Limits
Release intent
User explicitly requested direct stable publication, skipping candidate observation. Merge this feature first; then release pending plugin bundles, then host stable version/tag via main and GitHub Actions.
Linux CI correction
node:fs/promisesmodule mock with fault injection on realFileHandlemethods. Production publication code and all eight Linux assertions are unchanged.pnpm preflight:cipassed after this correction. Linux Git/review tests: 264 passed, 3 platform skips. Actual Linux publication smoke: six scenarios passed, including candidate replacement/tampering/removal and normal 0755 publication.