Hacktoberfest 2026: the issues maintainers tagged for October, open and beginner-friendly. Browse Hacktoberfest issues

gh stack modify --continue hides subsequent rebase conflict details

Open
#405 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
3/5
Estimated time
1-2 days
Newbie friendliness
68/100
Issue type
Bug
Clarity
Mostly clear
Activity status
Quiet
Tech stack
go
Domain
cli

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

bug topic: cli - modify

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

  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:

    git add <file>
    
  6. Continue:

    gh stack modify --continue
    
  7. 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.

Dominant language
Go
Stars
1.5k
Forks
73
Avg merge
1d 8h
Merged PRs (30d)
7

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from github/gh-stack

All issues in github/gh-stack

Similar issues

More Go issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.