Support moving or copying changes for worktree #2547
Draft
+39
−14
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
Tyriar
previously approved these changes
Dec 11, 2025
Contributor
There was a problem hiding this comment.
Pull request overview
This PR enhances the Copilot CLI chat session worktree feature by allowing users to choose between moving or copying uncommitted changes when creating an isolated worktree. Previously, users could only "Include Changes" (which moved them). Now users are presented with two distinct options: "Move Changes" (deletes from source) and "Copy Changes" (keeps in source).
Key Changes
- Replaced single "Include Changes" button with "Move Changes" and "Copy Changes" options
- Refactored confirmation handling logic by renaming
handlePushConfirmationDatatogenerateConfirmationResponseIfNeededand extractinggenerateUncommittedChangesConfirmation - Updated the git migration logic to conditionally delete from source based on user choice
src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
Outdated
Show resolved
Hide resolved
src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
Show resolved
Hide resolved
…ontribution.ts Co-authored-by: Copilot <[email protected]>
Yoyokrazy
previously approved these changes
Dec 12, 2025
Merge branch 'osortega/added-guineafowl' of https://github.com/microsoft/vscode-copilot-chat into osortega/added-guineafowl
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.
Ref: microsoft/vscode#281572