github / github/gh-stack

gh stack modify --continue hides subsequent rebase conflict details

オープン
#405 コメント 0 件 リアクション 0 件 担当者 0 名 GitHub で見る
bug topic: cli - modify
主要言語
Go
スター
1.5k
フォーク
70
平均マージ
1日 8時間
マージ済み PR(30日)
7

説明

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

コントリビューションガイド

コントリビューションガイドを開く

調査の方向性

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.

索引モデルが issue の本文から書いたものです。

評価

技術スタック
go
領域
cli
issue の種類
バグ
難易度
3/5
見積もり時間
1〜2日
活発さ
静か
明瞭さ
おおむね明確
初心者へのやさしさ
68/100

新しい issue をメールで受け取る

初心者向けの GitHub issue を短くまとめたダイジェスト。