Resolve Merge Conflicts Agent Skill
Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles.
- Context cost
- 475 tokensestimated from the bundle, loaded when it triggers
- Bundle
- 1 file · 1.9 kBtext throughout, nothing executable
- Licence
- Apache-2.0the author’s own terms
- Last change
- —no release on file
- Servers it uses
- Noneruns standalone
What it does
Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles.
Installed, it changes the agent in these ways.
What this skill changes about the agent has not been set out here as a list. Its SKILL.md, shown below, says it in the author’s own words.
And these are the jobs people reach for it for.
The skill itself
A skill is instructions the model reads, and here they are in full: the front matter loads with every session, and the body below it loads when the skill triggers.
Nothing in a skill executes. The client loads the text and the model follows it, so a skill can be audited the way a runbook is — by reading it.
What it costs in context
Skills are not billed by the call. They are paid for in context: every token the instructions occupy is a token your code, your diff and your conversation cannot use. Here is what this one takes and when it takes it.
475 tokens, estimated from the bundle at four bytes to the token, held for the rest of the session once it triggers. Small enough to keep loaded permanently without thinking about it.
A server charges by the month. A skill charges once per session, in context, and then keeps charging it for as long as the session lives.
Before and after
The same question, put to the same model twice: once as it comes, and once with these instructions loaded.
No worked example has been published for this skill yet.
The procedure it runs
The procedure has not been set out here step by step. It is in the body of its SKILL.md, shown in full above.
These steps are written for a model to follow, not executed by a runtime. It can still be told to skip one, and it will say so when it does.
Servers it uses
None. This skill calls no MCP servers at all.
Everything it needs is in the instructions, so it works in a project with nothing connected — the model reads the file and changes how it works with what it can already reach.
It asks the agent to write files, using whatever file access your client already has. Whether it reaches the network is not declared.
Read from the allowed-tools line of this skill’s own SKILL.md. It also asks for Bash, which could do either, so what is not named there is not ruled out. A skill grants no permissions of its own — it can only ask for tools your client already has.
What it will not do
Every skill is narrow, and the useful ones say where they stop. These are the jobs this one is the wrong tool for.
What this skill is not for has not been published here. Nothing is implied by that: it is a section the author has not filled in.
What is in the bundle
1 file, 1.9 kB on disk. A bundle is text throughout: the instructions the model reads, plus the templates it fills in.
- SKILL.md1.9 kB
No dependencies and nothing executable: a skill is text the agent reads, so the bundle is 1 file you can review in full before installing. The Apache-2.0 licence covers the templates and examples as well as the instructions.
Install
Installing copies the bundle into your project. Nothing runs at install time — the files sit on disk until the model reads them.
# Resolve Merge Conflicts · 475 tokens when loaded · macOS, Linux
mkdir -p .claude/skills && t=$(mktemp -d) &&
curl -fsSL -o "$t/bundle.tar.gz" https://mcprush.com/api/skills/resolve-merge-conflicts/bundle.tar.gz &&
tar -xzf "$t/bundle.tar.gz" -C "$t" && [ -d "$t/resolve-merge-conflicts" ] &&
{ [ ! -e .claude/skills/resolve-merge-conflicts ] || { mv .claude/skills/resolve-merge-conflicts "$t/.previous" && echo "Previous copy moved to $t/.previous"; }; } &&
mv "$t/resolve-merge-conflicts" .claude/skills/ && echo "Installed .claude/skills/resolve-merge-conflicts"npx mcprush@latest skill add hashgraph-online/resolve-merge-conflictsWindows PowerShell says 'running scripts is disabled on this system'? Run Set-ExecutionPolicy -Scope CurrentUser RemoteSigned once, or type npx.cmd instead of npx (codex.cmd, gemini.cmd, grok.cmd likewise). PowerShell 7 needs neither. Writes to .claude/skills/resolve-merge-conflicts/ in the current project. For every project instead, run mkdir -p ~/.claude/skills && t=$(mktemp -d) && curl -fsSL -o "$t/bundle.tar.gz" https://mcprush.com/api/skills/resolve-merge-conflicts/bundle.tar.gz && tar -xzf "$t/bundle.tar.gz" -C "$t" && [ -d "$t/resolve-merge-conflicts" ] && { [ ! -e ~/.claude/skills/resolve-merge-conflicts ] || { mv ~/.claude/skills/resolve-merge-conflicts "$t/.previous" && echo "Previous copy moved to $t/.previous"; }; } && mv "$t/resolve-merge-conflicts" ~/.claude/skills/ && echo "Installed ~/.claude/skills/resolve-merge-conflicts" (macOS, Linux) — or add --global to the npx line. The curl line replaces .claude/skills/resolve-merge-conflicts/ only after the download succeeds, so files left there by another skill of the same name, or by an older release, do not mix in. A copy already there is moved aside, not deleted, and the line prints where. It appears as resolve-merge in Gemini CLI, Codex, Copilot and Grok (its own name); Claude Code lists it by the folder name, resolve-merge-conflicts.
Which clients pick it up on their own
A skill is a folder of text. Most of these read a skills folder and pick it up without being told; the rest take the same folder another way — an upload in the app, a parameter on an API call — and then choose it by its description just the same.
Versions
Its author publishes no version number, so there is nothing here to pin to: what you install is the folder as it stands today. Instructions change more often than APIs do — a skill can be rewritten entirely without anything it depends on moving.
Nothing to pin to: this skill carries no version number of its own. What you install is what the folder holds on the day you install it.
Reviews
Nobody has reviewed this skill yet. The rating is the mean of the reviews written here, so there is none until somebody writes the first.
A review is tied to an account so it can be answered, edited and taken down by the person who wrote it.
Sign inAnybody with an account, one review each. It carries the version that was current when you wrote it, and the publisher may reply once.