mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-03 23:37:53 +01:00
changelog: GST-1214 fragment
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
88b8f36cb3
commit
22b9772776
1 file changed
+1
@@ -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.
|
||||
Reference in new issue
Block a user