Skip to content

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

Description

@hoxyq

See the stack up to react/react#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?

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions