A stacked pull request cannot use auto-merge
Nadie ha tomado este issue todavía.
Evaluación
- Dificultad
- 4/5
- Tiempo estimado
- 3-5 días
- Aptitud para principiantes
- 48/100
Línea de trabajo
Comienza con el comando gh stack link y reproduce el rechazo usando el escenario de dos capas del issue. Lee el tratamiento de auto-merge y de la vinculación de stacks junto con los issues relacionados #174, #172, #502 y #503. Se considera terminado cuando las pull requests apiladas pueden conservar auto-merge, o cuando el comando y el panel del stack explican claramente la incompatibilidad y el requisito de ponerlas manualmente en la cola.
Escrito por el modelo de indexación a partir del texto del issue.
Descripción
Summary
gh stack link refuses a pull request that has auto-merge enabled, so adopting a stack costs a capability that an unstacked pull request keeps. Every layer then needs a person at the keyboard at the moment the layer below lands.
Evidence
Both pull requests approved and green. #101 had auto-merge enabled, so linking failed:
Checking existing stacks...
Looking up PRs for 2 branches...
✗ PR #101 cannot be added to a stack: it has auto-merge enabled
Turning auto-merge off let the link succeed.
This compounds the behaviour in #174. When the bottom layer merges, the layer above leaves the queue and GitHub rewrites its head, which restarts its required checks. Nothing puts it back. With auto-merge unavailable, only a person can, and only once the restarted checks finish. A stack of three with a 15-minute required check needs three waits and three manual enqueues to land one change.
Expected
A stacked pull request can use auto-merge, so each layer enqueues itself once its base merges and its checks pass.
If the two genuinely cannot coexist, say so where the user meets it: gh stack link should explain why auto-merge and stacks are exclusive, and the stack panel should say that each layer needs a manual enqueue.
Actual
gh stack link rejects the pull request with no explanation of the conflict, and offers no alternative.
Environment
gh2.100.0,gh stackv0.0.8- Trunk protected by a merge queue,
merge_method: REBASE - Two-layer stack, both pull requests approved with required checks passing
Reproduction
- Open two pull requests that stack on each other, both approved and green.
- Enable auto-merge on the bottom one.
- Run
gh stack link <bottom> <top>.
Note on scope
This reports only what was observed: gh stack link rejects a pull request that already has auto-merge enabled. The reverse direction, enabling auto-merge on a pull request that is already stacked, was not tested, because the repository in question has allow_auto_merge: false set at the repository level for unrelated reasons.
Related
- #174 — the layer above leaves the queue and is not put back, which is what makes the missing auto-merge costly
- #172 — "'Merge stack' appears to enqueue only the bottom PR"
- #502 — the merge queue rewrites a commit that needed no rewrite, which is what restarts the checks
- #503 — the panel gives no sign that a manual enqueue is needed
- Lenguaje dominante
- Go
- Estrellas
- 1.5k
- Forks
- 73
- Merge medio
- 1 d 8 h
- PR fusionados (30 d)
- 7
Guía de contribución
Primeros pasos
- Lee el issue completo y luego la guía de contribución del proyecto.
- Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
- Haz un fork del repositorio y trabaja en una rama.
- Abre un pull request que haga referencia al número del issue.
Más de github/gh-stack
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 85/100
-
Dificultad 1/5 Menos de una hora Aptitud para principiantes 92/100
-
feature request topic: cli - general
Dificultad 2/5 1-3 horas Aptitud para principiantes 68/100
-
feature request topic: auto-merge
Dificultad 2/5 1-3 horas Aptitud para principiantes 68/100
-
bug topic: docs
Dificultad 1/5 Menos de una hora Aptitud para principiantes 68/100
Todos los issues de github/gh-stack
Issues similares
-
Remove PSPs from Helm chart Abiertofeature-request helm
Dificultad 2/5 1-3 horas Aptitud para principiantes 68/100
gravitational/teleport#69785 ·
-
bug
Dificultad 1/5 Menos de una hora Aptitud para principiantes 92/100
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 84/100
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 88/100
crossplane/crossplane#7859 ·
-
Dificultad 1/5 Menos de una hora Aptitud para principiantes 90/100