Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 00:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sessions - add prompt for merging changes (#303607)

Browse Source 
* Sessions - add prompt for merging changes

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Ladislau Szomoru
2026-03-20 20:48:34 +00:00
committed by GitHub
parent 71b623764e
commit 79d5a79218
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/sessions/prompts/merge-changes.prompt.md Normal file
View File

@@ -0,0 +1,10 @@
---
description: Merge changes from the topic branch to the merge base branch
---
<!-- Customize this prompt and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
Merge changes from the topic branch to the merge base branch.
The context block appended to the prompt contains the source and target branch information.
1. If there are any uncommitted changes, use the `/commit` skill to commit them
2. Merge the topic branch into the merge base branch. If there are any merge conflicts, resolve them and commit the merge. When in doubt on how to resolve a merge conflict, ask the user for guidance on how to proceed