feat(windows): add merge, rebase, and conflict resolution UI - #107

Merged

1lck merged 11 commits into

1lck:preview/0.3.0from

yangboxuan726:feat/windows-git-merge-rebase-ui

Aug 16, 2026

Commits on Aug 16, 2026

feat(windows): translate merge and rebase commands for the platform dispatcher
yangboxuan726
committed
f21842e
feat(windows): adapt operation state and integration preflight results
yangboxuan726
committed
a9a0e4e
feat(windows): track in-progress Git operations in the git store
yangboxuan726
committed
664b2a5
feat(windows): add the Git operation banner above the changes list
yangboxuan726
committed
be4d1d6
feat(windows): start merges and rebases from the branch manager
yangboxuan726
committed
a819206
feat(windows): guard commits while conflicts stay unresolved
yangboxuan726
committed
8cec913
fix(windows): stop the branch row click hijacking the action menu
yangboxuan726
committed
b725af1
fix(windows): drop the tooltip wrapper that killed the branch action menu
yangboxuan726
committed
1d78133
fix(windows): make the branch action menu usable
yangboxuan726
committed
a211186
Merge remote-tracking branch 'origin/preview/0.3.0' into codex/fix-pr107
1lck
committed
c6f5125
fix(windows): preserve Git integration recovery state
1lck
committed
1eb1616