merge

merge is a skill for Claude Code, Codex from microsoft/vscode. It costs 31 tokens per session (566 once invoked), scanned A, original, MIT.

A Git workflow for merging a topic branch—the branch where changes are developed—back into its base branch.

In plain words
What is it for?
Merging session work into a main branch and checking for conflicts before completing the merge.
Why use it?
It provides a defined way to bring completed work together while handling uncommitted changes and merge conflicts safely.

Skill for Claude CodeCodex ✓ vendor

Written for no agent in particular: nothing here depends on one.

Good fit Merging session work into a main branch and checking for conflicts before completing the merge.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/microsoft/vscode/merge
About the project

Visual Studio Code is a code editor that supports editing, navigating, understanding, debugging, and extending software projects. Developers use it for the edit-build-debug cycle, and the catalogue add-ons provide skills, instructions, and agents for working within the editor.

microsoft/vscode · 191,195 stars · on GitHub · code.visualstudio.com

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add microsoft/vscode --skill merge
Clone the repo
git clone --depth 1 https://github.com/microsoft/vscode

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for merge

README.md
[![agentmods](https://agentmods.dev/badge/skills/microsoft/vscode/merge.svg)](https://agentmods.dev/skills/microsoft/vscode/merge)
Your own site
<a href="https://agentmods.dev/skills/microsoft/vscode/merge"><img src="https://agentmods.dev/badge/skills/microsoft/vscode/merge.svg" alt="Measured on agentmods" height="20"></a>
Per session 31 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 566 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe. Third-party audits
  • Snyk pass 6 Sept 2026
How audits are shown
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00031 $0.00566
Opus 5 $0.00015 $0.00283
Sonnet 5 $0.00006 $0.00113
Haiku 4.5 $0.00003 $0.00057

Measured 3d ago against content hash b2a83acd902d, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-07, from the pricing page.

Security

Grade A, and why

merge scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 3d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

src/vs/sessions/skills/merge/SKILL.md · 73 lines

How it starts

The opening of the file, as written. The whole thing — 73 lines — stays where its author put it; the contents beside it link to each section on GitHub.

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
  1. 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 the full file on GitHub · 73 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 3d ago First seen · 73 lines · 31 tokens per session scan A b2a83acd902d

Subscribe to this mod's changes

merge is a skill published in the GitHub repository microsoft/vscode (191,195 stars, last pushed today), licensed MIT. It adds 31 tokens to every session and 566 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.