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
+---
+<!-- 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