github / github/gh-stack

rebase: merging indirectly via combined branch does not rebase higher prs

Open
#407 0 comments 4 reactions 0 assignees View on GitHub
bug topic: post-merge rebase
Dominant language
Go
Stars
1.5k
Forks
70
Avg merge
1d 8h
Merged PRs (30d)
7

Description

BUG:

We create release branches that combine many PRs/branches into a single PR. When that PR is merged to the root the original PRs are closed as merged, BUT any stacked PRs do not rebase onto the root.

Repro:

1. Create three PRs A and B and C, with B stacked on A.
2. Create a third PR, D, which combines branches A and C.
3. Merge D onto master.
4. Observe that B is still stacked on A, and if branch A is deleted, PR B is auto closed.

Contributor guide

Open the contributing guide

Research direction

No file, test, or entry point is named. Reproduce the A/B/C and combined D scenario, then trace the handling of merged pull requests and stacked-branch rebases; the fix is complete when B is rebased onto master after D merges and is not auto-closed when A is deleted.

Written by the indexing model from the issue text.

Assessment

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

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.