Skip to content

Improve refresh local base ref UX#2570

Open
brennanb2025 wants to merge 1 commit into
mainfrom
brennankbenson/refresh-local-base-ref-ux
Open

Improve refresh local base ref UX#2570
brennanb2025 wants to merge 1 commit into
mainfrom
brennankbenson/refresh-local-base-ref-ux

Conversation

@brennanb2025
Copy link
Copy Markdown
Contributor

Summary

  • clarify the Refresh Local Base Ref setting around stale git diff main...HEAD / AI diff comparisons
  • return a structured local-base-ref refresh result from worktree creation
  • show a warning toast when local main/master cannot be fast-forwarded because its owning worktree is dirty

Tests

  • pnpm exec vitest run --config config/vitest.config.ts src/main/git/worktree.test.ts src/main/ipc/worktrees.test.ts src/main/runtime/orca-runtime.test.ts src/renderer/src/store/slices/worktrees.test.ts
  • pnpm run typecheck:node
  • pnpm run typecheck:web
  • pnpm run lint

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant