Improve base branch detection#5636

Open

stefanhaller wants to merge 17 commits into

improve-base-branch-detection

Commits on May 25, 2026

Add test demonstrating wrong base branch on ambiguous merge-base
stefanhaller
committed
Pick base branch by smallest ahead instead of relying on for-each-ref's order
stefanhaller
committed
Reshape selection to expose the winning base ref
stefanhaller
committed
Share the multi-candidate selector between fast and legacy paths
stefanhaller
committed
Return all tied candidates from base-branch detection
stefanhaller
committed
Introduce BaseBranchHelper around candidate resolution
stefanhaller
committed
Route base-branch lookups through the shared resolver
stefanhaller
committed
Add disambiguation menu to BaseBranchHelper
stefanhaller
committed
Prompt for base branch when rebase-onto-base is ambiguous
stefanhaller
committed
Prompt for base branch when viewing divergence is ambiguous
stefanhaller
committed
Prompt for base branch when move-commits-to-new-branch is ambiguous
stefanhaller
committed
Show ? and ↓? in the branches list when the base is ambiguous
stefanhaller
committed
Document mainBranches and the disambiguation prompt
stefanhaller
committed
Signal ambiguity in the rebase-onto-base-branch label
stefanhaller
committed
Signal ambiguity in the view-divergence-from-base-branch label
stefanhaller
committed
Signal ambiguity in the move-commits-to-new-branch label and prompt
stefanhaller
committed
Show base branches as bare names in labels
stefanhaller
committed