Adds squash merge detection and merge target actions#4125
Merged
Conversation
865cada to
3e14005
Compare
eamodio
approved these changes
Mar 11, 2025
Member
eamodio
left a comment
There was a problem hiding this comment.
Looks good! Approved with minor tweaks
eamodio
reviewed
Mar 11, 2025
| }); | ||
| } | ||
|
|
||
| private async deleteBranchOrWorktree(ref: BranchRef, mergeTarget?: BranchRef) { |
Member
There was a problem hiding this comment.
Is there a confirmation for the delete happening or just the "Proceed" warnings below? If there is no other confirmations, then I think the wording need to be changed from what is below or suggested.
Contributor
Author
There was a problem hiding this comment.
I believe it just starts the "delete branch" flow, which includes quickpick steps/confirmations in it. It would be the same as choosing "delete branch" from a context menu, the only difference being the branch/worktree switch preceding it.
3e14005 to
a2da46c
Compare
saeedzaha
pushed a commit
to saeedzaha/vscode-gitlens
that referenced
this pull request
Apr 28, 2025
* Adds merge detection actions (push and delete) & squash merge detection on the merge target section in Home view.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Closes #4124
Note: there are known issues with the "delete worktree" case where when the worktree is deleted before deleting the branch, the "delete branch" portion of the commands fail to proceed because the commands are using a worktree path that no longer exists. These should be addressed in follow-up.