Description
When gh stack modify --continue advances an in-progress rebase and encounters another conflict, it prints only:
✗ 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
-
Create a stack where dropping or moving a lower branch causes conflicts in multiple downstream commits.
-
Run gh stack modify.
-
Apply the structural change.
-
Resolve the first conflict.
-
Stage the resolved file:
-
Continue:
gh stack modify --continue
-
Let the rebase encounter another conflict.
Actual result
Only the generic exit-status message appears:
✗ rebase continue failed — resolve remaining conflicts and try again: exit status 1
The user must separately run:
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:
Conflict rebasing <branch>
Conflicted files:
<file>
Resolve the conflicts, stage with `git add <file>`, 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.
Description
When
gh stack modify --continueadvances an in-progress rebase and encounters another conflict, it prints only:It does not show:
The initial
gh stack modifyconflict reports this information correctly. Subsequent conflicts reached through--continuedo not.Reproduction
Create a stack where dropping or moving a lower branch causes conflicts in multiple downstream commits.
Run
gh stack modify.Apply the structural change.
Resolve the first conflict.
Stage the resolved file:
Continue:
Let the rebase encounter another conflict.
Actual result
Only the generic exit-status message appears:
The user must separately run:
to discover that another conflict appeared and identify its files.
Expected result
gh stack modify --continueshould report the next conflict like the initial modify operation:Progress for successfully completed branches or commits should also remain visible.
Environment
gh2.97.0gh-stack0.1.0Additional 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
--continuereaches another conflicting commit.