resolve-conflicts

resolve-conflicts is a skill for Claude Code from haacked/dotfiles. It costs 29 tokens per session (2,077 once invoked), scanned A, original, no licence file.

A guide for resolving Git conflicts, which happen when different changes affect the same parts of a project. It includes structural merging, lock-file handling, and checks for duplicate changes in stacked pull requests.

In plain words
What is it for?
It is for merging conflicting code, handling dependency lock files, and finding repeated changes across stacked pull requests.
Why use it?
It helps deal with conflicts and related merge problems that are easy to miss when combining branches.

Skill for Claude Code

Written for Claude Code: argument-hint in frontmatter. Also seen: model in frontmatter.

Good fit It is for merging conflicting code, handling dependency lock files, and finding repeated changes across stacked pull requests.

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

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/haacked/dotfiles/resolve-conflicts"><img src="https://agentmods.dev/badge/skills/haacked/dotfiles/resolve-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 29 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,077 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.00029 $0.02077
Opus 5.5 $0.00012 $0.00831
Sonnet 5.5 $0.00006 $0.00415
Haiku 4.5 $0.00003 $0.00208

Measured 18d ago against content hash 526d9cddc3a0, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

resolve-conflicts 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 18d ago.

The scan reads SKILL.md. This mod also ships 6 executable files (scripts/categorize-conflicts.sh, scripts/conflict-status.sh, scripts/ensure-diff3-markers.sh, …), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

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.

ai/skills/resolve-conflicts/SKILL.md · 211 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

Files

What ships with it

6 files 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. 18d ago Changed 526d9cddc3a0
  2. 1mo ago Changed · +14 lines 00536d67e8ec
  3. 1mo ago First seen · 197 lines · 29 tokens per session scan A 769652463470

Subscribe to this mod's changes

resolve-conflicts is a skill published in the GitHub repository haacked/dotfiles (135 stars, last pushed yesterday), with no licence file. It adds 29 tokens to every session and 2,077 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-08-30.