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

gh stack rebase --continue doesn't report new conflicts hit while resuming a multi-commit branch rebase

未關閉
  • 哪裡不對？
#430 1 則留言 2 個 reaction 已指派 0 人 在 GitHub 檢視

還沒有人認領這個 Issue。

評估

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

研究方向

從 cmd/rebase.go 中的 continueRebase 開始，將其進行中的路徑與 printConflictDetailsWithContinue 進行比較。接著追蹤 internal/git/gitops.go 中的 git.RebaseContinue 和 internal/git/git.go 中的 tryAutoResolveRebase；使用 gh stack rebase --continue 重現多提交衝突流程。當後續衝突回報目前的 Conflicted files 區塊，而不只是通用錯誤時，即表示完成。

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

描述

bug topic: cli - rebase

Summary

gh stack rebase --continue only prints Conflicted files: listing for first conflict encountered when cascading one stacked branch onto another. If resolving that conflict and continuing causes git to hit a second conflict on a later commit within the same branch's replay, the tool does not report what files are now conflicted and just returns a generic wrapped error.

This can make it look like there's only one conflicted file when there are actually more. You can only see the other conflicts by manually running git status.

Steps to reproduce

  1. Create a stack with a branch containing at least two commits and at least two files, where:
    • Commit A modifies file1.txt so that there's a conflict with the (rebased) parent branch.
    • Commit B later modifies file2.txt so that it also conflicts with the parent branch, independently of commit A.
  2. Rebase the stack
  3. The tool stops on commit A's conflict and correctly prints: 
    Conflicted files:
  C file1.tsx (lines N–M)
  4. Resolve file1.txt, stage it, run gh stack rebase --continue again.
  5. Git internally applies commit B next, which conflicts on file2.txt.

Expected behavior

Step 5 should print the same kind of Conflicted files: block, listing file2.txt with its conflict line numbers, like step 3 did for file1.txt.

Actual behavior

Step 5 prints a generic error:

rebase continue failed — resolve remaining conflicts and try again: exit status 1

No indication of which file(s) are now conflicted. The only way to discover where the new conflict is is running git status manually.

Proposed solution / notes

I'll be honest, not familiar with Go so this "solution" is mostly Claude. I did double check that it looks at least mostly right to me. Figured it might be helpful.

Traced this to cmd/rebase.go and internal/git/git.go:

  • printConflictDetails() / printConflictDetailsWithContinue() (cmd/rebase.go:545) is the function that formats the Conflicted files: block with per-file conflict-marker line numbers (via git.FindConflictMarkers). It's only called from the branch-to-branch cascade logic, at cmd/rebase.go:259 and :435.
  • continueRebase() (cmd/rebase.go:312) has a separate path for resuming an already in-progress git rebase within a single branch's multi-commit replay: 
    if git.IsRebaseInProgress() {
    rebaseOpts := git.RebaseOpts{CommitterDateIsAuthorDate: state.CommitterDateIsAuthorDate}
    if err := git.RebaseContinue(rebaseOpts); err != nil {
        return fmt.Errorf("rebase continue failed — resolve remaining conflicts and try again: %w", err)
    }
}
    This path never calls printConflictDetails.
  • Following RebaseContinue (internal/git/gitops.go:334) into tryAutoResolveRebase (internal/git/git.go:118), the conflicted-files list is actually fetched — just to check whether rerere already auto-resolved everything — and then discarded on the way out: 
    conflicts, err := ConflictedFiles()
if err != nil {
    return originalErr
}
if len(conflicts) > 0 {
    return originalErr   // <-- conflicts is right here and gets thrown away
}

Fix: in continueRebase, when git.RebaseContinue returns an error, call printConflictDetailsWithContinue (using the still-in-progress rebase's current conflicted files, e.g. by calling git.ConflictedFiles() again, or by threading tryAutoResolveRebase's local conflicts slice out through the error) before returning, instead of just wrapping the raw error string. That gives resume-mid-branch conflicts the same reporting as cascade-boundary conflicts.

Environment

  • gh version: 2.97.0 (2026-07-31)
  • gh-stack extension: github/gh-stack v0.1.0
  • OS: macOS Tahoe 26.5.1
主要語言
Go
星號
1.6k
分支
78
30 天內沒有已合併 PR

環境準備

  • 沒有 Dockerfile 或 Docker Compose 檔案
  • 沒有 Pull Request 範本
  • 閱讀貢獻指南

從這裡開始

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

github/gh-stack 的其他 Issue

查看 github/gh-stack 的全部 Issue

相似的 Issue

更多 Go Issue

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

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