github / github/gh-stack

gh stack modify --continue hides subsequent rebase conflict details

Aperta
#405 0 commenti 0 reazioni 0 assegnatari Vedi su GitHub
bug topic: cli - modify
Lingua principale
Go
Stelle
1.5k
Fork
70
Merge medio
1g 8h
PR unite (30g)
7

Descrizione

## 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.

Guida per i contributori

Apri la guida per i contributori

Direzione di ricerca

Inizia dal percorso di recupero dai conflitti di gh stack modify --continue e confrontalo con la segnalazione iniziale dei conflitti di gh stack modify. Riproduci la sequenza di conflitti multipli descritta nell’issue, incluso lo staging della prima risoluzione, quindi verifica che il conflitto successivo mostri il branch, i file in conflitto, l’avanzamento e le istruzioni per risolvere, fare stage e continuare, invece del solo stato di uscita.

Scritto dal modello di indicizzazione a partire dal testo della issue.

Valutazione

Stack tecnologico
go
Ambito
cli
Tipo di issue
Bug
Difficoltà
3/5
Tempo stimato
1-2 giorni
Stato di attività
Tranquilla
Chiarezza
Abbastanza chiara
Idoneità per principianti
68/100

Ricevi le nuove issue nella tua casella

Un breve riepilogo di issue GitHub adatte ai principianti.