github / github/gh-stack

Can't merge the stack: either stuck while merging via GitHub UI, or getting false-negative error via CLI

未关闭
#498 1 条评论 5 个 reaction 已指派 0 人 在 GitHub 查看
主要语言
Go
星标
1.5k
派生
70
平均合并
1 天 8 小时
30 天内合并 PR
7

描述

See the stack up to https://github.com/react/react/pull/37498. All PRs were approved.

When I've attempted to merge it via UI, the merging was just stuck and never finished.
When attempted to merge via CLI, always received this error:
```
gh stack merge 37498 --yes --squash

Merging #37503, #37500, #37498 into main via squash...
✗ merge failed: protected branch 'main' check failed:
Waiting on 1 reapproval from someone other than the last pusher. Review from eps1lon is stale because it was submitted before the merge base changed.
Stack merges are atomic, so nothing was merged
```

This is incorrect, because merge based didn't change after the approval.

I was able to merge the bottom PR of the stack, but this extremely painful, because after that the base actually changes, and now I need to get re-approval from the reviewers. Please, could you finally fix the stacks?

贡献指南

打开贡献指南

调研方向

Reproduce with `gh stack merge 37498 --yes --squash` using the stack and approval state described in the issue, then trace the merge command's protected-branch check. No files or tests are named; done means the CLI and GitHub UI no longer block this stack when the merge base has not changed, while still respecting genuine reapproval requirements.

由索引模型根据 Issue 内容生成。

评估

技术栈
github, go
领域
cli
Issue 类型
缺陷
难度
4/5
预计耗时
3-5 天
活跃度
活跃
描述清晰度
基本清楚
新手友好度
48/100

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。