gh stack modify --continue hides subsequent rebase conflict details
Nobody has claimed this yet.
Assessment
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Newbie friendliness
- 68/100
Research direction
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.
Written by the indexing model from the issue text.
Description
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:
git add <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
gh2.97.0gh-stack0.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.
- Dominant language
- Go
- Stars
- 1.5k
- Forks
- 73
- Avg merge
- 1d 8h
- Merged PRs (30d)
- 7
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from github/gh-stack
-
Difficulty 2/5 1-3 hours Newbie friendliness 85/100
-
Difficulty 1/5 Under an hour Newbie friendliness 92/100
-
feature request topic: cli - general
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
feature request topic: auto-merge
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
bug topic: docs
Difficulty 1/5 Under an hour Newbie friendliness 68/100
Similar issues
-
Difficulty 2/5 1-3 hours Newbie friendliness 88/100
NVIDIA/gpu-operator#2955 ·
-
agentic-workflows
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
Difficulty 1/5 Under an hour Newbie friendliness 90/100
kovidgoyal/kitty#10516 ·
-
bug
Difficulty 1/5 Under an hour Newbie friendliness 90/100
cisagov/vulnrichment#337 ·
-
Difficulty 1/5 Under an hour Newbie friendliness 72/100