Skip to content

feat: add source control action to abort merge#2092

Merged
brennanb2025 merged 4 commits into
stablyai:mainfrom
leynier:support-merge-abort
May 27, 2026
Merged

feat: add source control action to abort merge#2092
brennanb2025 merged 4 commits into
stablyai:mainfrom
leynier:support-merge-abort

Conversation

@leynier

@leynier leynier commented May 16, 2026

Copy link
Copy Markdown
Contributor

Summary

  • add a Source Control dropdown action to abort an in-progress merge
  • route git merge --abort through local, SSH, runtime RPC, preload, and renderer git clients
  • add a confirmation dialog and refresh the affected worktree status after aborting

Closes #2090

Validation

  • pnpm exec vitest run --config config/vitest.config.ts src/main/git/status.test.ts src/main/providers/ssh-git-provider-merge.test.ts src/main/ipc/filesystem.test.ts src/main/runtime/rpc/methods/git.test.ts src/renderer/src/runtime/runtime-git-client-merge.test.ts src/renderer/src/components/right-sidebar/source-control-dropdown-items.test.ts
  • pnpm run typecheck:node && pnpm run typecheck:web
  • git diff --check

Note: validation emits the existing Node engine warning because this shell is using Node v26.0.0 while the repo requests Node 24.

@leynier leynier changed the title Add Source Control action to abort merge feat: add source control action to abort merge May 17, 2026
@brennanb2025 brennanb2025 force-pushed the support-merge-abort branch from 578c4c6 to d4587f5 Compare May 27, 2026 19:32
@brennanb2025

brennanb2025 commented May 27, 2026

Copy link
Copy Markdown
Contributor

Thanks for this PR, and sorry for the delay in reviewing it!

Reviewed and pushed a follow-up commit: d4587f5fc review: make abort merge reachable during conflicts.

I rebased the PR onto current main and decided to keep this PR over #2423. The main issue I found after rebase was that current Source Control hides the commit area while a merge/conflict operation is active, so a dropdown-only Abort merge action could be unreachable exactly when users need it. The follow-up surfaces Abort merge directly in the conflict summary and merge operation banner.

@brennanb2025 brennanb2025 force-pushed the support-merge-abort branch from 7f9adad to 71594b7 Compare May 27, 2026 21:41
@brennanb2025 brennanb2025 merged commit 659fe79 into stablyai:main May 27, 2026
1 check passed
thomaszdxsn pushed a commit to thomaszdxsn/orca that referenced this pull request Jun 15, 2026
Co-authored-by: Orca <help@stably.ai>
Co-authored-by: brennanb2025 <brennankbenson@gmail.com>
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.

[Feature]: Add Source Control action to abort merge

2 participants