Repository navigation
Replies: 64 comments 51 replies
|
Same issue with rebase for me. |
|
Are signed commits required on your repos? I'm having the same issue. |
|
Running into the same issue in our repo as well |
|
My repo does not require signed commits (it's the single one in the org like this, I believe). The one outstanding thing I can think of is that the stack is based off a commit that is no longer the tip of |
|
I've had the same problem. My repo doesn't require signed commits. |
|
Same problem, we have stack with everything ready, but both squash or merge does not work. |
|
Luckily, for us it didn't get stuck when trying to merge the stack. However, it only merged the first (bottom) PR, then returned to "Ready" status for the other PRs. Since only one PR got merged, the "Rebase Stack" button became available again, but upon trying to rebase, it reported conflicts. Yet, there were no conflicts, as a local |
|
x-posting from #256 Hey all, thanks for the reports. We've identified a bug where approvals are not being appropriately evaluated when merging a stack of multiple PRs. We're actively investigating and will update when we've released a fix. In the meantime, you can get around this by merging one PR at a time. I know it's not ideal, but hopefully that will unblock your workflows in the short-term. Appreciate your patience! |
|
I’m seeing the same problem here :/ Since the public preview started, it hasn’t been working properly. |
|
Same issue here! Will you fix this in the short term? |
|
I have the same issue. |
|
Same here. And merging one by one doesn't work because it reruns the CI every time and drops PR approvals, so it's not a valid workaround. |
|
I have the same problem. It's a shame. |
|
I have this issue as well, which completely eliminates one of the main benefits of stacked PRs as they're unable to merge together atomically via a single merge group in the merge queue. My basic stacked PR setup
Observed behavior
Settings
Note that unlike others, my repository doesn't even require approvals or signed commits. |
|
+1, same for me can't Squash-and-merge, tried twice 🙄 |
|
Is there a plan to fix the "Dismiss stale pull request approvals" issue or will this just be the state? |
|
The branch protection is what caused this for us. when turning off the approval reqs for PR's it merged immediately. This setting was turned on on main: and gave this error in the terminal: both PR's had two approvals by other team members |
|
Bro |
|
When do you plan to fix the problem? Because constantly hacking project permissions just to make a feature work is not an option. 🙄 |
|
The feature got pretty useless with the recent bugs |
|
How is this feature available for public preview when such a core part of it doesn't work? 😢 I shall give it more time to bake in the oven before considering trying it again. |
|
same issue for me |
|
Same problem |
|
Will looking forward on the fix. |
|
It's funny, they fixed the perma spins I suppose as I now see the approval blocking message when I try to merge the stack. I realized it's the "make approvals stale when new changes are pushed to the branch" rule that's causing the issue here. But fcol! Who is so dumb to not create a way to differentiate between changes brought in through stacks vs changes through independent PRs or manual commits / merges. 🤦🏻♂️ Stacks are useless without a way to differentiate between stacks and other changes. And disabling the stale approval rule is not the way, if a dev makes changes the approvals have to go stale for re-review. |
|
Following up on @imanmahjoubi's 2026-08-11 update about the fix for squash-merge queues: we still see the false conflict with a rebase merge queue, as of 2026-10-06, and we traced how it happens. In case it helps: Setup. An organization repository. What happens. In all five attempts between 2026-09-30 and 2026-10-06, only the bottom layer landed per queue pass. The layer above left the queue every time:
After the restack, the child's checks run again (about 7 minutes) and a re-enqueue lands it (about 10 minutes). So each extra layer costs about 20 minutes plus someone to re-enqueue it. Why it happens. We replayed three of these attempts (2026-09-30, 2026-10-03 and the first one on 2026-10-06):
So the stack itself is fine. It looks like the child's queue entry is built, or re-checked when the parent merges, from the child's head before the restack. Either of two changes would fix it:
The replay script emulates a per-commit rebase with #!/usr/bin/env bash
# usage: replay.sh <onto> <range-base> <range-head>
set -u
cur=$1
for c in $(git rev-list --reverse "$2..$3"); do
p=$(git rev-parse "$c^")
out=$(git merge-tree --write-tree --merge-base="$p" "$cur" "$c"); rc=$?
tree=$(printf '%s\n' "$out" | head -1)
if [ "$rc" -ne 0 ]; then echo "CONFLICT applying $c"; printf '%s\n' "$out" | sed -n '2,12p'; exit 1; fi
prev_tree=$(git rev-parse "$cur^{tree}")
cur=$(git commit-tree "$tree" -p "$cur" -m "replay $c")
if [ "$tree" = "$prev_tree" ]; then echo "empty: $c"; else echo "ok: $c"; fi
done
echo "CLEAN tree=$(git rev-parse "$cur^{tree}")"
We have more timelines if they are useful. |
|
Is there a reason this issue wasn't a blocker for GA (let alone preview)? https://github.blog/changelog/2026-10-06-stacked-pull-requests-generally-available |






Uh oh!
There was an error while loading. Please reload this page.
Before:

After:

I've been stuck looking at these spinners for hours. Nothing is merging. I've cancelled and retried a few times; no luck.
All reactions