github / github/gh-stack

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

Open
#498 1 comment 5 reactions 0 assignees View on GitHub
Dominant language
Go
Stars
1.5k
Forks
70
Avg merge
1d 8h
Merged PRs (30d)
7

Description

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?

Contributor guide

Open the contributing guide

Research direction

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.

Written by the indexing model from the issue text.

Assessment

Tech stack
github, go
Domain
cli
Issue type
Bug
Difficulty
4/5
Estimated time
3-5 days
Activity status
Active
Clarity
Mostly clear
Newbie friendliness
48/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.