Conversation
Add trial merge check before jobs enter the merge train to detect conflicts early. Jobs that would conflict are marked needs_rebase and the plan pauses at an on_error checkpoint. - Add checkMergeability() to merge-train.ts for trial merges - Integrate trial merge in orchestrator reconcile loop - Add retry arg to plan-approve for needs_rebase jobs - Add ready_to_merge → needs_rebase transition in plan-types - Add tests for all new functionality Closes #36
nigel-dev
deleted the
mc/integration-2b1e22ca-89a0-4404-96a4-0ba2ab3dee37
branch
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.
Summary
Orchestrated plan plan-recovery-system with 3 job(s).
Closes #39, closes #16, closes #36
Jobs
Testing
bun testpassed after each merge (528 tests, 0 failures)bun installNotes
mc/integration-2b1e22ca-89a0-4404-96a4-0ba2ab3dee37b5712421🚀 Automated PR from Mission Control