Hacktoberfest 2026:維護者為十月標記出來的 issue,仍然開放、適合新手。 瀏覽 Hacktoberfest issue

gh stack modify --continue hides subsequent rebase conflict details

未關閉
#405 0 則留言 0 個 reaction 已指派 0 人 在 GitHub 檢視

還沒有人認領這個 Issue。

評估

難度
3/5
預估耗時
1-2 天
新手友好度
68/100
Issue 類型
缺陷
描述清晰度
基本清楚
活躍度
冷清
技術堆疊
go
領域
cli

研究方向

從 gh stack modify --continue 的衝突復原路徑開始,並將其與 gh stack modify 初始的衝突報告進行比較。重現 issue 中描述的多重衝突流程,包括暫存第一個解決結果,然後確認下一個衝突會顯示分支、衝突檔案、進度,以及解決、暫存和繼續的指示,而不只是結束狀態。

由索引模型根據 Issue 內容生成。

描述

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.

主要語言
Go
星號
1.5k
分支
73
平均合併
1 天 8 小時
30 天內合併 PR
7

貢獻指南

開啟貢獻指南

從這裡開始

  1. 先讀完整個 Issue,再讀專案的貢獻指南。
  2. 在 Issue 下留言說明你要接手 —— 這能避免兩個人做同樣的事。
  3. Fork 儲存庫,在一個分支上完成修改。
  4. 送出 Pull Request,並在描述裡引用這個 Issue 編號。

github/gh-stack 的其他 Issue

查看 github/gh-stack 的全部 Issue

相似的 Issue

更多 Go Issue

把新 issue 寄到你的電子郵件信箱

精選適合新手參與的 GitHub issue 摘要。