feat(git): friendly checkout error messages with stash & switch recovery#1785

Open

Marve10s wants to merge 18 commits into

pingdotgg:mainfrom

Marve10s:feat/checkout-dirty-worktree-error-handling

Commits on Apr 17, 2026

feat(git): friendly checkout error messages with stash & switch recovery
Marve10s
committed
feat(git): wire stash recovery into EnvironmentApi and fix optimistic UI
Marve10s
committed
Fix client settings type coverage for thread preview count
Marve10s
committed
Match client settings fixture to desktop contract
Marve10s
committed
fix(git): add missing refreshGitStatus to stashDrop and handle persistent dirty worktree errors
Marve10s
committed
Remove unnecessary git checkout scope requirement
Marve10s
committed
Skip stash pop when stash push creates no entry
Marve10s
committed
fix(git): preserve dirty worktree metadata
Marve10s
committed
Merge upstream/main into feat/checkout-dirty-worktree-error-handling
Marve10s
committed

Commits on Apr 18, 2026

fix(git): handle ignored checkout conflicts
Marve10s
committed

Commits on Apr 20, 2026

Commits on Apr 24, 2026

Commits on Apr 29, 2026

Commits on May 11, 2026

Merge upstream/main into feat/checkout-dirty-worktree-error-handling
Marve10s
committed