merge-resolver

merge-resolver is a skill for Claude Code from magnusrodseth/dotfiles. It costs 62 tokens per session (601 once invoked), scanned A, original, no licence file.

A Git conflict assistant that examines conflicting branches, commits, and file changes to recommend how the conflicts should be resolved. Git conflicts happen when separate changes affect the same part of a file.

In plain words
What is it for?
Use it when Git reports unmerged paths or a merge conflict, including while merging branches or integrating other commits.
Why use it?
It explains the competing changes and reduces the guesswork involved in deciding what the final code should contain.

Skill for Claude Code

Written for Claude Code: installed under .claude/.

Good fit Use it when Git reports unmerged paths or a merge conflict, including while merging branches or integrating other commits.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/magnusrodseth/dotfiles/merge-resolver
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 magnusrodseth/dotfiles --skill merge-resolver
Clone the repo
git clone --depth 1 https://github.com/magnusrodseth/dotfiles

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

README.md
[![agentmods](https://agentmods.dev/badge/skills/magnusrodseth/dotfiles/merge-resolver/github.svg)](https://agentmods.dev/skills/magnusrodseth/dotfiles/merge-resolver)
Your own site
<a href="https://agentmods.dev/skills/magnusrodseth/dotfiles/merge-resolver"><img src="https://agentmods.dev/badge/skills/magnusrodseth/dotfiles/merge-resolver/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 merge-resolver

Your own site · 80×15
<a href="https://agentmods.dev/skills/magnusrodseth/dotfiles/merge-resolver"><img src="https://agentmods.dev/badge/skills/magnusrodseth/dotfiles/merge-resolver.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 62 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 601 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 unknown 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.00062 $0.00601
Opus 5 $0.00031 $0.00300
Sonnet 5 $0.00012 $0.00120
Haiku 4.5 $0.00006 $0.00060

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

Security

Grade A, and why

merge-resolver 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 8d 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.

.claude/skills/merge-resolver/SKILL.md · 77 lines

The source is not reproduced here

No licence file

A repository with no LICENSE is all rights reserved by default, so the body is not copied here. The metadata, the measurements and the link are.

Read it on GitHub

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. 8d ago First seen · 77 lines · 62 tokens per session scan A d31d2c2e590c

Subscribe to this mod's changes

merge-resolver is a skill published in the GitHub repository magnusrodseth/dotfiles (2 stars, last pushed 4d ago), with no licence file. It adds 62 tokens to every session and 601 once invoked, about $0.0003 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-08-31.

Related

Other skills, from other repositories

pixiv-cli-ci

Diagnose, verify, monitor, and safely operate pixiv-cli GitHub Actions runs and local CI gates, including PR Quality gate, workflow policy, platform smoke, native/browser evidence, release handoffs, and approved reruns. Use when checks fail or hang, a PR needs readiness verification, a workflow run needs root-cause…

FlanChanXwO/pixiv-cli · 82 tokens

semantic-szz-analyzer

Identify bug-introducing commits using semantic analysis that extends traditional SZZ algorithm. Distinguishes semantic changes from refactorings or code movements using control-flow and data-flow similarity analysis. Use when analyzing bug-fix commits to trace back to bug-introducing changes, investigating software…

ArabelaTso/Skills-4-SE · 96 tokens

szz-bug-introducing-commit-identifier

Identifies bug-introducing commits using SZZ-style analysis based on bug-fixing commits, commit history, and code blame information. Use this skill when you need to trace bugs back to their origin, identify which commits introduced bugs, analyze bug-fix commits to find root causes, perform software repository mining…

ArabelaTso/Skills-4-SE · 121 tokens

git-bisect-assistant

Automatically performs git bisect to identify the first bad commit that introduced a bug or failure. Use when debugging regressions, tracking down when a test started failing, or identifying which commit broke functionality. Handles flaky tests with retry logic and provides comprehensive reports with bisect logs and…

ArabelaTso/Skills-4-SE · 64 tokens

wispr-flow-debug

Debug and test the Wispr Flow AutoHotkey dictation triggers (Copilot key + extra keys) from WSL by deploying macos.ahk to the Windows Desktop, reloading AutoHotkey, and reading the debug log. Use when an activation/trigger key isn't starting/stopping dictation, when the overlay clicks land wrong, or when verifying a…

sfc-gh-eraigosa/dotfiles · 87 tokens

steward

Drive a pull request on this repository to green — which fast checks to run before pushing, how to read a red check, and what to do about a review comment. Use when a CI failure, a review comment, a merge conflict, or a scheduled check-in arrives on a PR you opened or were asked to drive.

yschimke/compose-ai-tools · 69 tokens