github / github/gh-stack

gh stack modify --continue hides subsequent rebase conflict details

Aberta
#405 0 comentários 0 reações 0 responsáveis Ver no GitHub
bug topic: cli - modify
Linguagem predominante
Go
Estrelas
1.5k
Forks
70
Merge médio
1d 8h
PRs com merge (30d)
7

Descrição

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

Guia de contribuição

Abrir o guia de contribuição

Direção de pesquisa

Comece pelo caminho de recuperação de conflitos de gh stack modify --continue e compare-o com o relatório inicial de conflitos de gh stack modify. Reproduza a sequência de múltiplos conflitos descrita na issue, incluindo o staging da primeira resolução, e então verifique se o próximo conflito mostra a branch, os arquivos em conflito, o progresso e as instruções para resolver, fazer stage e continuar, em vez de exibir apenas o status de saída.

Escrita pelo modelo de indexação a partir do texto da issue.

Avaliação

Stack de tecnologia
go
Domínio
cli
Tipo de issue
Bug
Dificuldade
3/5
Tempo estimado
1-2 dias
Status de atividade
Pouca atividade
Clareza
Razoavelmente clara
Facilidade para iniciantes
68/100

Receba novas issues na sua caixa de entrada

Um resumo curto de issues do GitHub para quem está começando.