gh stack modify --continue hides subsequent rebase conflict details
- Langage dominant
- Go
- Étoiles
- 1.5k
- Forks
- 70
- Merge moyen
- 1 j 8 h
- PR mergées (30 j)
- 7
Description
## Description
When `gh stack modify --continue` advances an in-progress rebase and encounters another conflict, it prints only:
```text
✗ rebase continue failed — resolve remaining conflicts and try again: exit status 1
```
It does not show:
- Which branch is being rebased
- Which files conflict
- Rebase progress
- The usual resolve/stage/continue instructions
The initial `gh stack modify` conflict reports this information correctly. Subsequent conflicts reached through `--continue` do not.
## Reproduction
1. Create a stack where dropping or moving a lower branch causes conflicts in multiple downstream commits.
2. Run `gh stack modify`.
3. Apply the structural change.
4. Resolve the first conflict.
5. Stage the resolved file:
```bash
git add
```
6. Continue:
```bash
gh stack modify --continue
```
7. Let the rebase encounter another conflict.
## Actual result
Only the generic exit-status message appears:
```text
✗ rebase continue failed — resolve remaining conflicts and try again: exit status 1
```
The user must separately run:
```bash
git status
git diff --name-only --diff-filter=U
```
to discover that another conflict appeared and identify its files.
## Expected result
`gh stack modify --continue` should report the next conflict like the initial modify operation:
```text
Conflict rebasing
Conflicted files:
Resolve the conflicts, stage with `git add `, then run
`gh stack modify --continue`.
```
Progress for successfully completed branches or commits should also remain visible.
## Environment
- `gh` 2.97.0
- `gh-stack` 0.1.0
- macOS 26.6
## Additional context
This appears distinct from #146. No merged or pruned branch lookup is involved at this stage; the modify operation is already in conflict recovery and `--continue` reaches another conflicting commit.
Guide de contribution
Ouvrir le guide de contribution
Piste de recherche
Start at the gh stack modify --continue conflict-recovery path and compare it with the initial gh stack modify conflict reporting. Reproduce the multi-conflict sequence described in the issue, including staging the first resolution, then verify that the next conflict shows the branch, conflicted files, progress, and resolve/stage/continue instructions instead of only the exit status.
Rédigé par le modèle d'indexation à partir du texte de l'issue.
Évaluation
- Stack technique
- go
- Domaine
- cli
- Type d'issue
- Bug
- Difficulté
- 3/5
- Temps estimé
- 1-2 jours
- Activité
- Calme
- Clarté
- Plutôt claire
- Accessibilité débutants
- 68/100