github / github/gh-stack

gh stack modify --continue hides subsequent rebase conflict details

未关闭
#405 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看
bug topic: cli - modify
主要语言
Go
星标
1.5k
派生
70
平均合并
1 天 8 小时
30 天内合并 PR
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.

贡献指南

打开贡献指南

调研方向

从 gh stack modify --continue 的冲突恢复路径开始,并将其与 gh stack modify 初始的冲突报告进行比较。重现 issue 中描述的多冲突流程,包括暂存第一个解决结果,然后验证下一个冲突显示分支、冲突文件、进度以及解决、暂存和继续的说明,而不只是退出状态。

由索引模型根据 Issue 内容生成。

评估

技术栈
go
领域
cli
Issue 类型
缺陷
难度
3/5
预计耗时
1-2 天
活跃度
冷清
描述清晰度
基本清楚
新手友好度
68/100

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。