From b85e4cef84ce9fe1e4ea33effbfd3ff0161f5472 Mon Sep 17 00:00:00 2001 From: garrytan Date: Mon, 2 Nov 2026 19:02:18 +0000 Subject: [PATCH] Revert "docs: keep docs/ship-policy.md at the reviewed text; its GST-980 sentence already states the carry rule" This reverts commit f926ccb0c206ce9b1cf2387f3500558a20102510. --- docs/ship-policy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/ship-policy.md b/docs/ship-policy.md index 630feb694..4ad00c410 100644 --- a/docs/ship-policy.md +++ b/docs/ship-policy.md @@ -1359,6 +1359,7 @@ receipt when the base moves: | a rebase or force-push onto a tree the receipt covers, product diff against the new base unchanged | carries (`carry.ancestry: rewritten`) | | any other rebase or force-push | a fresh /ship (`RECEIPT_CARRY_TREE_MISMATCH`) | | a stacked PR whose parent landed (squash or merge), retargeted to the base with the base merged in, HEAD's product diff exactly the one reviewed against the parent branch | carries (reason `stack parent landed`) | +| a stamp on the branch's own rows in a stamp file the branch also changed as product: every changed line at a branch-added position, the file's mode unchanged, the base not touching it, the rest of the product diff unchanged | carries (reason `a stamp on the branch's own rows ()`) | **Stacked PRs (#3570).** A child PR's receipt is written against its parent branch, so its `base` names that branch and its `product_patch_id` is the