You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
pr-flow: catch up and re-test before merging when v2/main moved under the PR #5589
A PR can merge into v2/main without ever having been tested against the tip it merges into. On 2026-11-18 that turned v2/main red (#5569): #5567 raised fetch's Python floor, #5564 added new fetch code, each was gated and CI-green against a base that lacked the other, GitHub reported the second as cleanly mergeable, and the combination failed ruff check. CI on the push caught it only after the merge.
The pr-flow skill's merge step (step 10) says nothing about the base having moved, and AGENTS.md has no rule for it. The v2/main ruleset (v2/main: PRs only) does not require it either; whether it should is #5588.
What is asked
A rule, and the recipe for it:
Rule (AGENTS.md, Issue-driven work style): before merging, a PR whose base has moved in a way that can interact with it is caught up and re-tested. "Can interact" needs a definition that is cheap to check and errs toward re-testing. A starting point: any commit on origin/v2/main since the PR's CI ran that touches the same server directory, or repository-wide configuration (root package.json, package-lock.json, a lockfile, lint/type/test configuration, scripts/, workflows). "Cleanly mergeable" is explicitly not sufficient.
Recipe (pr-flow, step 10): the command that lists what landed on origin/v2/main since the PR head's merge base, how to decide from it, and the catch-up: merge origin/v2/main into the branch (no rebase or force-push), run the gate, push, wait for CI on the new head. State that a conflict-free catch-up does not need a new Copilot round.
Fan-outs: a note that a PR changing a server's configuration (a language floor, lint or compiler settings, a dependency major) interacts with every open PR in that server, so it merges last or the others are re-tested after it.
Done when
AGENTS.md carries the rule and pr-flow carries the recipe, each stated once.
pr-flow's eval cases cover the new step if its description changes; npm run verify:skills passes.
Out of scope
Enforcing this in the ruleset or with a merge queue: #5588.
Activity