Remove Merge button from worktrees #10924
Merged
+2
−604
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Merge button only merged to main, which doesn't make sense when main is protected. Changes: - Removed merge button from WorktreesView UI - Removed merge modals and merge-related state/handlers - Removed mergeWorktree message handler from webviewMessageHandler - Removed handleMergeWorktree function from worktree handlers - Removed mergeWorktree method from worktreeService - Removed MergeWorktreeOptions and MergeWorktreeResult types - Removed merge-related translations from all 17 locale files
dosubot
bot
added
size:L
Contributor
All issues have been resolved. Ready to merge.
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
mrubens
deleted the
feature/ext-608-remove-merge-button-from-worktrees
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Merge button in worktrees only merges to main, which doesn't make sense in any place where the main branch is protected.
Changes
mergeWorktreemessage handler from webviewMessageHandlerhandleMergeWorktreefunction from worktree handlersmergeWorktreemethod from worktreeServiceMergeWorktreeOptionsandMergeWorktreeResulttypesResolves EXT-608
Important
Remove merge button and related functionality from worktree UI and backend due to limited usefulness with protected main branches.
WorktreesView.mergeWorktreemessage handler fromwebviewMessageHandler.handleMergeWorktreefunction fromworktreehandlers.mergeWorktreemethod fromworktreeService.MergeWorktreeOptionsandMergeWorktreeResulttypes.This description was created by
for 3675e53. You can customize this summary. It will automatically update as commits are pushed.