fix: keep coordinated changes in the merge approval flow - #6
Merged
Merged
Conversation
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.
Coordinated API/client changes on a minimal installation could finish after PR publication without entering Ship’s merge flow. Coordination then classified the API as failed because it had no recorded merge, leaving the client held.
Both coordination children now explicitly request classification and the existing merge-approval boundary, independent of deployment-wide defaults. Human approval, actor rechecks, serious-change handling and the recorded-merge dependency remain intact. Existing failed attempts are preserved; this does not infer an external merge or rewrite their histories.
Validation: regression fails on the previous implementation; lint and all 1,412 runtime tests pass. Script suites pass 100 tests with one existing skip after supplying the worktree’s missing web dependency link. Live producer/consumer acceptance remains pending on the candidate.