chore(porch): 271 state commits stranded after #274 merged - #277
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
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.
Refs #233. Refs #271.
Porch writes its state commits after the PR merges, so the four below could not have been
in #274:
This is #233 — porch state commits stranded on a completed builder branch — happening again,
with the same shape.
The diff is one file
codev/projects/271-safety-adjacent-an-architect-c/status.yaml. Main's copy still readsphase: prwith the gate pending; this branch readsphase: verifiedwithapproved_at: 2026-08-31T17:19:19andmerged: trueon the PR history entry. This branch isthe correct state and main is stale.
What is not in the diff, and why the branch had to be updated first
origin/mainwas eleven commits ahead of this branch — #274's own merge commit plus all ofbugfix-264 (#270), which merged in between. Opening this PR from the branch as it stood would
have shown those eleven as deletions: a state-commit PR that silently reverted someone else's
merged work, and it would have looked small in the title.
So
origin/mainwas merged into the branch first. That is not a cherry-pick and it does nottouch main; it is the branch catching up to what it was already merged into. After it, the diff
against main is the single file above and nothing else.
Test plan
origin/main, so the PR reverts nothing🤖 Generated with Claude Code