github / github/gh-stack

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

Ouverte
#407 0 commentaires 4 réactions 0 personnes assignées Voir sur GitHub
bug topic: post-merge rebase
Langage dominant
Go
Étoiles
1.5k
Forks
70
Merge moyen
1 j 8 h
PR mergées (30 j)
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.

Guide de contribution

Ouvrir le guide de contribution

Piste de recherche

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.

Rédigé par le modèle d'indexation à partir du texte de l'issue.

Évaluation

Stack technique
git, github, go
Domaine
cli
Type d'issue
Bug
Difficulté
4/5
Temps estimé
3-5 jours
Activité
Calme
Clarté
Plutôt claire
Accessibilité débutants
45/100

Recevez les nouvelles issues par e-mail

Un résumé court des issues GitHub adaptées aux débutants.