agent-customization
**WORKFLOW SKILL** — Create, update, review, fix, or debug VS Code agent customization files (.instructions.md, .prompt.md,…
@microsoftInstall SkillDevelopment
Skill
/merge
Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.
Claude Code
$ npx -y skills add microsoft/vscode --skill merge --agent claude-code
Codex
$ npx skills add microsoft/vscode --skill merge -a codex -y
Cursor
$ npx skills add microsoft/vscode --skill merge -a cursor -y
Gemini CLI
$ npx skills add microsoft/vscode --skill merge -a gemini-cli -y
GitHub Copilot
$ npx skills add microsoft/vscode --skill merge -a github-copilot -y
OpenCode
$ npx skills add microsoft/vscode --skill merge -a opencode -y
Windsurf
$ npx skills add microsoft/vscode --skill merge -a windsurf -y
SKILL.md
merge.SKILL.mdname: merge
description: Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.
<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
Merge Changes
Merge the topic branch (checked out in the current worktree) into the merge base branch (checked out in the main worktree). The context block appended to the prompt contains the source branch, target branch, and main worktree path.
Guidelines
- **Never force-push** (`--force`, `--force-with-lease`) without explicit user approval.
- **Never skip pre-push hooks** (do not use `--no-verify`).
- **Never rewrite or drop commits** without asking the user.
- When in doubt about conflict resolution — ask the user.
Workflow
1. Commit uncommitted changes in the current worktree
Check for uncommitted changes in the current worktree:
git status --porcelain
If there are uncommitted changes, use the `/commit` skill to commit them before continuing.
2. Merge the topic branch into the base branch
Use `git -C <main-worktree-path>` to run commands against the main worktree without leaving the current worktree.
git -C <main-worktree-path> merge <topic-branch>
3. Handle merge conflicts
If the merge reports conflicts:
3.1. List conflicted files:
git -C <main-worktree-path> diff --name-only --diff-filter=U
3.2. For each conflicted file, read the file content, resolve the conflict by preserving the intent of both sides, and stage the resolved file:
git -C <main-worktree-path> add <resolved-file>
3.3. When in doubt on how to resolve a merge conflict, ask the user for guidance. If the user wants to abort, run:
git -C <main-worktree-path> merge --abort
3.4. Once all conflicts are resolved and staged, commit the merge:
git -C <main-worktree-path> commit --no-edit
Validation
After the merge completes, verify the result:
1. Confirm the main worktree is clean:
git -C <main-worktree-path> status --porcelain
2. Confirm the topic branch is an ancestor of the base branch (i.e. all commits are merged):
git -C <main-worktree-path> merge-base --is-ancestor <topic-branch> HEAD
Read more
name: merge description: Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.
<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
Merge Changes
Merge the topic branch (checked out in the current worktree) into the merge base branch (checked out in the main worktree). The context block appended to the prompt contains the source branch, target branch, and main worktree path.
Guidelines
- **Never force-push** (`--force`, `--force-with-lease`) without explicit user approval.
- **Never skip pre-push hooks** (do not use `--no-verify`).
- **Never rewrite or drop commits** without asking the user.
- When in doubt about conflict resolution — ask the user.
Workflow
1. Commit uncommitted changes in the current worktree
Check for uncommitted changes in the current worktree:
git status --porcelain
If there are uncommitted changes, use the `/commit` skill to commit them before continuing.
2. Merge the topic branch into the base branch
Use `git -C <main-worktree-path>` to run commands against the main worktree without leaving the current worktree.
git -C <main-worktree-path> merge <topic-branch>
3. Handle merge conflicts
If the merge reports conflicts:
3.1. List conflicted files:
git -C <main-worktree-path> diff --name-only --diff-filter=U
3.2. For each conflicted file, read the file content, resolve the conflict by preserving the intent of both sides, and stage the resolved file:
git -C <main-worktree-path> add <resolved-file>
3.3. When in doubt on how to resolve a merge conflict, ask the user for guidance. If the user wants to abort, run:
git -C <main-worktree-path> merge --abort
3.4. Once all conflicts are resolved and staged, commit the merge:
git -C <main-worktree-path> commit --no-edit
Validation
After the merge completes, verify the result:
1. Confirm the main worktree is clean:
git -C <main-worktree-path> status --porcelain
2. Confirm the topic branch is an ancestor of the base branch (i.e. all commits are merged):
git -C <main-worktree-path> merge-base --is-ancestor <topic-branch> HEAD
Stats
195,361
Stars
43,837
Forks
Active
Maintenance
TypeScript
Language
MIT
License
Last commit
Created
195k26 skills1 MCP
Stars on GitHub
Momentum
- stars in total
- 195.3k
Other skills on vscode.
@microsoftInstall Skillchronicle
Analyze Copilot session history for standup reports, usage tips, session search, and session reindexing. Use when the user asks…
@microsoftInstall Skillcreate-canvas
Create a Copilot extension canvas at user, workspace, or plugin scope.
@microsoftInstall Skillcreate-hook
Create a hook (.json) to enforce policy or automate agent lifecycle events.
@microsoftInstall Skillcreate-instructions
Create an instructions file (.instructions.md) for a project rule or convention.
@microsoftInstall SkillMore skills from other plugins.
Auto-invoked
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or…
@obraInstall Skillask-matt
Ask which skill or flow fits your situation. A router over the skills in this repo.
@mattpocockInstall SkillAuto-invoked
Questions about merge.
- Which coding agents can use merge?
- merge installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.