Merge Agent Skill

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.

572 tokens

context cost

the whole folder, loaded on every use

files

instructions only

copies elsewhere

how many repositories repackaged it

188278

stars on the repo

on the repository, not the skill itself

Install

one command, takes just this skill from the repository

npx skills add https://github.com/microsoft/vscode --skill merge

The instruction itself

7 sections, as written by the author

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:

Confirm the main worktree is clean:

git -C <main-worktree-path> status --porcelain

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

Other skills for the same job

different authors, same section of the catalogue

Hook Development

by anthropics

vendor ×2

This skill should be used when the user asks to "create a hook", "add a PreToolUse/PostToolUse/Stop hook", "validate tool use", "implement prompt-based hooks", "use ${CLAUDE_PLUGIN_ROOT}", "set up event-driven automation", "block dangerous commands", or mentions hook events (PreToolUse, PostToolUse, Stop, SubagentStop, SessionStart, SessionEnd, UserPromptSubmit, PreCompact, Notification). Provides comprehensive guidance for creating and implementing Claude Code plugin hooks with focus on advanced prompt-based hooks API.

Build agentic applications with GitHub Copilot SDK. Use when embedding AI agents in apps, creating custom tools, implementing streaming responses, managing sessions, connecting to MCP servers, or creating custom agents. Triggers on Copilot SDK, GitHub SDK, agentic app, embed Copilot, programmable agent, MCP server, custom agent.

Coding Agent Session Search - unified CLI/TUI to index and search local coding agent history from Claude Code, Codex, Gemini, Cursor, Aider, ChatGPT, Pi-Agent, Factory, and more. Purpose-built for AI agent consumption with robot mode.

Destructive Command Guard - High-performance Rust hook for Claude Code that blocks dangerous commands before execution. SIMD-accelerated, modular pack system, whitelist-first architecture. Essential safety layer for agent workflows.

Makepad UI development skills for Rust apps: setup, patterns, shaders, packaging, and troubleshooting.

Secure environment variable management ensuring secrets are never exposed in Claude sessions, terminals, logs, or git commits

Prompt for generating an AGENTS.md file for a repository

2k tokens

How to use it

Copy the folder

Take microsoft/merge from the repository into ~/.claude/skills for personal use, or into .claude/skills inside a project.

Check the name does not clash

The agent identifies a skill by the name field in its header. Two skills with the same name cannot sit side by side — one of them will be ignored.