Repository navigation

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

Closed

Marve10s wants to merge 18 commits into

pingdotgg:mainfrom

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

Commits on Apr 17, 2026
Commits on Apr 18, 2026
- fix(git): handle ignored checkout conflicts
  Marve10s
  committed
  91709b3
Commits on Apr 20, 2026
- fix(git): address review comments on checkout error handling
  Marve10s
  committed
  301e9cc
- style: apply oxfmt to checkout error handling files
  Marve10s
  committed
  146b672
Commits on Apr 24, 2026
- Merge remote-tracking branch 'upstream/main' into feat/checkout-dirty-worktree-error-handling
  Marve10s
  committed
  c240917
- Add stash discard recovery modal
  Marve10s
  committed
  26c156d
Commits on Apr 29, 2026
- fix(web): guard stash discard branch action state
  Marve10s
  committed
  9345413
- fix(web): report rejected nested branch actions
  Marve10s
  committed
  97f198a
- fix(server): refresh git status after stash checkout failure
  Marve10s
  committed
  3b76843
Commits on May 11, 2026
- Merge upstream/main into feat/checkout-dirty-worktree-error-handling
  Marve10s
  committed
  144ec1a