From 64ea51b5adb2d70131e062f65b21697aa5d7ec22 Mon Sep 17 00:00:00 2001 From: garrytan Date: Sun, 1 Nov 2026 00:49:35 +0000 Subject: [PATCH] docs(wave): settle accepts a wave PR the train merged directly Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- docs/ship-policy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/ship-policy.md b/docs/ship-policy.md index e1ec290c0..20920e124 100644 --- a/docs/ship-policy.md +++ b/docs/ship-policy.md @@ -624,7 +624,9 @@ gstack-ship-queue wave settle --wave [--dry-run] # after the wave one version section. - **After the merge.** `wave settle` finds the wave PR merged into the base branch, checks that its merge commit is on that branch and carries its head - tree, and walks its chain (train land's stamp commits on top are allowed). A + (the head's tree, or the head merged onto the merge's parent when the train + merged the PR directly), and walks its chain (train land's stamp or update + commits on top are allowed). A constituent still at its pin gets a "Landed in wave #W as vX (sha)" comment naming any integrator commits or hand-resolved merges that touched its files, and is closed. One whose head moved after the wave froze stays open