Skip to content

docs(agents): document PR stacking, promotion, and submodule merge rules - #190

Merged
trvon merged 1 commit into
experimentalfrom
docs/agents-pr-flow
Sep 23, 2026
Merged

trvon merged 1 commit into
experimentalfrom
docs/agents-pr-flow

Conversation

@trvon

@trvon trvon commented Sep 23, 2026

Copy link
Copy Markdown
Owner

Problem

#187 was stacked on #186 and merged into feat/graph-topology 14 seconds after #186 had merged that branch into experimental, so its commits missed experimental (and the promotion PR #188) until #189 carried them over.

Solution

Add a short "Branches, PRs & Promotion" section to AGENTS.md: PRs target experimental; merge stacks bottom-up (or retarget the child first); verify with git cherry origin/experimental origin/<branch>; merge submodule PRs without squashing and before the YAMS pointer bump.

Release Note

  • Internal only (no user-facing release note)

Breaking Changes

  • None

Documentation

  • Docs updated (AGENTS.md)

AI usage

  • No AI used
  • AI used in an assistive role only, and I manually reviewed the full change
  • If AI was used, I disclosed the use and can explain every part of this PR

A stacked PR (#187) merged into its parent branch after the parent (#186)
had already merged into experimental, so its commits missed experimental
and the promotion PR until #189 carried them over. Record the merge order,
a git cherry check for stranded commits, and the no-squash rule for
submodule PRs.
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying yams with  Cloudflare Pages  Cloudflare Pages

Latest commit: fe7aad5
Status: ✅  Deploy successful!
Preview URL: https://9007d0ae.yams.pages.dev
Branch Preview URL: https://docs-agents-pr-flow.yams.pages.dev

View logs

@trvon
trvon merged commit 08bf4e4 into experimental Sep 23, 2026
15 of 16 checks passed
@trvon
trvon deleted the docs/agents-pr-flow branch October 3, 2026 02:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant