Skip to content

git: add abort merge/rebase actions to the Branch submenu#307990

Open
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
yogeshwaran-c:fix/abort-merge-ui-visibility
Open

git: add abort merge/rebase actions to the Branch submenu#307990
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
yogeshwaran-c:fix/abort-merge-ui-visibility

Conversation

@yogeshwaran-c
Copy link
Copy Markdown
Contributor

@yogeshwaran-c yogeshwaran-c commented Apr 6, 2026

Summary

  • Adds Abort Merge (git.mergeAbort) and Abort Rebase (git.rebaseAbort) commands to the Branch submenu in the Source Control view
  • These menu items are conditionally shown only when a merge or rebase is in progress (via gitMergeInProgress / gitRebaseInProgress context keys)
  • Previously, users had to use the Command Palette to find these actions since they were not discoverable in the SCM UI where Merge and Rebase are initiated

Fixes #284362

Test plan

  • Start a merge that results in conflicts; verify "Abort Merge" appears in Source Control > Branch submenu
  • Start a rebase that results in conflicts; verify "Abort Rebase" appears in Source Control > Branch submenu
  • Confirm both menu items are hidden when no merge/rebase is in progress
  • Confirm clicking the menu items successfully aborts the merge/rebase

@vs-code-engineering
Copy link
Copy Markdown
Contributor

vs-code-engineering Bot commented Apr 6, 2026

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@lszomoru

Matched files:

  • extensions/git/package.json

Surface `git.mergeAbort` and `git.rebaseAbort` commands in the
Source Control Branch submenu so users can easily discover and
invoke them during an active merge or rebase, rather than having
to use the Command Palette.

Fixes microsoft#284362
@yogeshwaran-c yogeshwaran-c force-pushed the fix/abort-merge-ui-visibility branch from f5d5df3 to 7befa7a Compare April 6, 2026 16:20
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.

Abort merge does not show in the UI

2 participants