Squashing and merging a stack is stuck

[mlaccetti]

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.

[ace22b]

Same issue with rebase for me.

[andykenward]

Are signed commits required on your repos? I'm having the same issue.

[yannickgloster]

Running into the same issue in our repo as well

[borfast]

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 main, and I'm trying to rebase + merge the stack without updating it first (because I don't want the approvals I have to be dismissed).

[nemith]

I've had the same problem. My repo doesn't require signed commits.

[yannickgloster]

Getting a new error on this now when I go to merge, with no explanation on why it's not mergable

[wolszews]

Getting a new error on this now when I go to merge, with no explanation on why it's not mergable

Same here. First day trying to use GH Stacked PRs and everything works fine but merge'ing (Squash and merge stack)

[FrkAk]

Same problem, we have stack with everything ready, but both squash or merge does not work.

[sassomedia]

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 gh stack sync rebased fine without issues. After the sync, the PRs were ready to merge again, but seemingly only one at a time. - Stack mergeing does not seem to work at this time.

[skarim]

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!

[nemith]

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!

Not really. With branch protections merging one at time is dismissing review status so this workaround doesn't work for me.

[andykenward]

I've found using the gh cli doesn't dismiss the approvals. You still have to merge one PR at a time.

gh stack rebase
gh stack push

[borfast]

But as soon as you merge one of the PRs, the approvals get dismissed. How does the restacking from the CLI help there?

[Plasma]

This is bricked for me, it says "Merging.." but sits there doing nothing.

[DanKing1903]

Also bricked for me, I'm only trying to merge a single PR, not the whole stack.