diff --git a/changelog.d/capy-a-stacked-carry-ignores.md b/changelog.d/capy-a-stacked-carry-ignores.md new file mode 100644 index 000000000..ec6df3c8c --- /dev/null +++ b/changelog.d/capy-a-stacked-carry-ignores.md @@ -0,0 +1 @@ +- **A stacked PR's /ship receipt now carries even when the child merged main before its receipt was written (GST-1214).** After the parent squash-landed and main was merged in again, `gstack-ship-receipt carry` compared the range from the parent's head, which still held every file the child's first main merge brought in, and refused with `RECEIPT_CARRY_PRODUCT_CHANGED` naming those files. The carry now leaves out paths whose content at the reviewed head is main's, unless HEAD changed them. A real edit to one of those files still refuses.