File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -22,11 +22,9 @@ source "$SCRIPT_DIR/command_utils.sh"
2222CONFLICT_LABEL=" autorestack-needs-conflict-resolution"
2323
2424# Machine-readable marker embedded (invisibly) in the conflict comment so the
25- # conflict-resolved run can recover the exact stack state. We rely on this rather
26- # than re-deriving it from `gh pr list --head <base>`: when the base is a
27- # long-lived integration branch that heuristic returns an unrelated ancient merge
28- # (e.g. a years-old release merge), and it cannot tell whether a human retargeted
29- # the PR in the meantime.
25+ # conflict-resolved run can recover the exact stack state it recorded, instead of
26+ # re-deriving the parent PR from the PR's current base branch (which breaks when
27+ # anything about that base changes, e.g. a human retargeting the PR manually).
3028STATE_MARKER_PREFIX=" <!-- autorestack-state:"
3129
3230# Args: base-branch target-branch squash-hash. Branch names and hashes contain no
You can’t perform that action at this time.
0 commit comments