agentmods.dev

git-merge

git-merge is a skill for Claude Code from microsoft/hve-core. It costs 35 tokens per session (613 once invoked), scanned A, original, MIT.

A local Git workflow for merging branches or rebasing their commits onto another base. Rebasing moves commits onto a new starting point, while merging combines branch histories.

In plain words
What is it for?
Use it to merge a branch, rebase it, run rebase-onto operations, resolve conflicts, and receive a completion summary.
Why use it?
It structures branch integration and conflict handling without pushing changes to a remote repository. Optional pauses allow review during conflict resolution.

Skill for Claude Code ✓ vendor

Written for Claude Code: disable-model-invocation in frontmatter.

not rated 1.6krepo +14 changed yesterday A scan 35 tokens original MIT

Good fit Use it to merge a branch, rebase it, run rebase-onto operations, resolve conflicts, and receive a completion summary.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/microsoft/hve-core/git-merge
View source ↗ microsoft/hve-core
About the project

HVE Core is a collection of agents, prompts, coding instructions, and skills for building repeatable software-development workflows with GitHub Copilot. It is intended for individuals and teams that want structured AI-assisted research, planning, implementation, and review, while the catalogue entries provide many of its reusable workflow components.

microsoft/hve-core · 1,606 stars · on GitHub

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/hve-core --skill git-merge
Clone the repo
git clone --depth 1 https://github.com/microsoft/hve-core

Made for: Claude Code.

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 git-merge

README.md
[![agentmods](https://agentmods.dev/badge/skills/microsoft/hve-core/git-merge/github.svg)](https://agentmods.dev/skills/microsoft/hve-core/git-merge)
Your own site
<a href="https://agentmods.dev/skills/microsoft/hve-core/git-merge"><img src="https://agentmods.dev/badge/skills/microsoft/hve-core/git-merge/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for git-merge

Your own site · 80×15
<a href="https://agentmods.dev/skills/microsoft/hve-core/git-merge"><img src="https://agentmods.dev/badge/skills/microsoft/hve-core/git-merge.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 35 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 613 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.
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.00035 $0.00613
Opus 5.5 $0.00014 $0.00245
Sonnet 5.5 $0.00007 $0.00123
Haiku 4.5 $0.00003 $0.00061

Measured yesterday against content hash 8146eb7da246, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-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 yesterday.

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.

.github/skills/hve-core/git-merge/SKILL.md · 46 lines

How it starts

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

Git Merge and Rebase

Goal

Run a merge, rebase, or rebase --onto sequence from the current branch with explicit inputs, optional review pauses, and a completion summary. Follow every step even when the repository appears clean so results stay consistent and traceable.

Conventions

Read references/merge-conventions.md and follow its integration, authorization, account-change, and execution-evidence rules.

Inputs

  • operation (optional, default merge): merge, rebase, or rebase-onto.
  • branch (required): the branch or ref to merge, or the rebase target. Ask for it when it is missing.
  • onto (required for rebase-onto): the new base.
  • upstream (optional, used by rebase-onto): the branch or commit that bounds the commits to move.
  • conflict-stop (optional, default false): when true, pause after each set of conflict fixes for user review before continuing.

Flow

  1. Resolve the inputs. Ask for branch when it is missing, and for onto when operation is rebase-onto. Record the active branch and the inputs.
  2. Prepare the workspace as the merge conventions define, then run the command they define for the selected operation and capture its output. Without conflicts, continue at step 5.
  3. Resolve conflicts as the conventions define, and keep each file's resolution and rationale for the summary.
  4. Honor review pauses. When conflict-stop is true, summarize the fixes with a checklist of touched files and wait for explicit user confirmation before continuing. Answer follow-up questions and adjust resolutions from user feedback.
  5. Continue or complete the operation as the conventions define, or abort when the user directs it.
  6. Execute an authorized ordinary push under those conventions; otherwise leave the result local without soliciting publishing approval. Summarize the integration, linked conflict resolutions, stash state, actual push/account-cleanup outcomes when applicable, and remaining follow-up.

Read the full file on GitHub · 46 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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. yesterday Changed 8146eb7da246
  2. 15d ago Changed · +4 lines · -7 tokens per session 277135a31a48
  3. 1mo ago First seen · 42 lines · 42 tokens per session scan A cc115959a93b

Subscribe to this mod's changes

git-merge is a skill published in the GitHub repository microsoft/hve-core (1,606 stars, last pushed today), licensed MIT. It adds 35 tokens to every session and 613 once invoked, about $0.0001 per session on Opus 5.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-10-08.

Git and workflow
Related

git-merge compared with skills from other repositories

git-merge next to 6 skills from other repositories
ModTypeStarsLast pushLicenceScanTokensWorks with
git-mergemicrosoft/hve-coreSkill1.6ktodayMITA35Claude Code
merge-batchdiegosouzapw/OmniRouteSkill85ktodayMITA46Claude Code
prowler-commitprowler-cloud/prowlerSkill15ktodayApache-2.0A44Claude Code, Codex
gh-auth-isolationgithub/gh-awSkill5.6ktodayMITA20Claude Code, Codex
comet-githubrpamis/cometSkill3.3ktodayMITA72Claude Code, Codex
github-skillzeenie-ai/OpenCompanySkill1.1k3d agoMITA51Claude Code
re0-mergeLilMGenius/paperthinSkill1.4ktodayMITA70Claude Code