From 79d5a7921895e625516ff803f00cf3ab56cfc28b Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Fri, 20 Mar 2026 20:48:34 +0000 Subject: [PATCH] Sessions - add prompt for merging changes (#303607) * 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> --- src/vs/sessions/prompts/merge-changes.prompt.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/vs/sessions/prompts/merge-changes.prompt.md diff --git a/src/vs/sessions/prompts/merge-changes.prompt.md b/src/vs/sessions/prompts/merge-changes.prompt.md new file mode 100644 index 00000000000..065cb18ad18 --- /dev/null +++ b/src/vs/sessions/prompts/merge-changes.prompt.md @@ -0,0 +1,10 @@ +--- +description: Merge changes from the topic branch to the merge base branch +--- + + +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