github / github/gh-stack

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

Abierto
#498 1 comentario 5 reacciones 0 asignados Ver en GitHub
Lenguaje dominante
Go
Estrellas
1.5k
Forks
70
Merge medio
1 d 8 h
PR fusionados (30 d)
7

Descripción

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?

Guía de contribución

Abrir la guía de contribución

Línea de trabajo

Reproduce con `gh stack merge 37498 --yes --squash` usando el stack y el estado de aprobación descritos en el issue, y luego rastrea la comprobación de ramas protegidas del comando de merge. No se nombran archivos ni pruebas; estar terminado significa que la CLI y GitHub UI ya no bloquean este stack cuando la base del merge no ha cambiado, sin dejar de respetar los requisitos genuinos de reaprobación.

Escrito por el modelo de indexación a partir del texto del issue.

Evaluación

Stack tecnológico
github, go
Área
cli
Tipo de issue
Error
Dificultad
4/5
Tiempo estimado
3-5 días
Estado de actividad
Activo
Claridad
Bastante claro
Aptitud para principiantes
48/100

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.