merge-conflict-resolution

merge-conflict-resolution is a skill for Claude Code, Codex from kimtth/agent-skill-100-lines-or-less. It costs 21 tokens per session (238 once invoked), scanned A, original, no licence file.

A guide for handling Git merge and rebase conflicts, which happen when separate changes affect the same code.

In plain words
What is it for?
Resolving conflicts during merges and rebases while preserving the intended changes.
Why use it?
It helps you combine changes without accidentally deleting work or choosing the wrong version.

Skill for Claude CodeCodex

Which agent this was written for is unclear — body not stored (licence); the path alone says nothing.

Good fit Resolving conflicts during merges and rebases while preserving the intended changes.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution
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 kimtth/agent-skill-100-lines-or-less --skill merge-conflict-resolution
Clone the repo
git clone --depth 1 https://github.com/kimtth/agent-skill-100-lines-or-less

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-conflict-resolution

README.md
[![agentmods](https://agentmods.dev/badge/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution/github.svg)](https://agentmods.dev/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution)
Your own site
<a href="https://agentmods.dev/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution/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-conflict-resolution

Your own site · 80×15
<a href="https://agentmods.dev/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/kimtth/agent-skill-100-lines-or-less/merge-conflict-resolution.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 21 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 238 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.00021 $0.00238
Opus 5 $0.00010 $0.00119
Sonnet 5 $0.00004 $0.00048
Haiku 4.5 $0.00002 $0.00024

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

Security

Grade A, and why

merge-conflict-resolution 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 12d 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.

skills/merge-conflict-resolution/SKILL.md · 32 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. 12d ago First seen · 32 lines · 21 tokens per session scan A fd7b475fc8e2

Subscribe to this mod's changes

merge-conflict-resolution is a skill published in the GitHub repository kimtth/agent-skill-100-lines-or-less (2 stars, last pushed 2mo ago), with no licence file. It adds 21 tokens to every session and 238 once invoked, about $0.0001 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

spec-kitty-git-workflow

Understand how Spec Kitty manages git: what git operations Python handles automatically, what agents must do manually, worktree lifecycle, auto-commit behavior, merge execution, and the safe-commit pattern. Triggers: "how does spec-kitty use git", "worktree management", "auto-commit", "who commits what", "git…

Priivacy-ai/spec-kitty · 125 tokens

spk-admin-git-workflow

Operate Spec Kitty git workflows, worktrees, safe commits, merge preflights, stale state checks, and recovery.

Priivacy-ai/spec-kitty · 32 tokens

spk-gate-merge

Merge an accepted Spec Kitty mission safely, preserving git invariants, mission state, and post-merge follow-through.

Priivacy-ai/spec-kitty · 30 tokens

056-design-avoid-breaking-changes

Use when you need to review a plan, OpenSpec change, specification, or implementation proposal for breaking-change risk across commands, skills, generated outputs, XML sources, README/docs, tests, CI, APIs, schemas, configuration, data, migration, and release guidance. This should trigger for requests such as Review…

jabrena/plinth · 106 tokens

pr-comment-review

Audit and remediate an open GitHub PR's review feedback: verify Copilot and Codex actually reviewed, drive every unresolved thread to a fix-or-justify reply, correct PR title/description drift against the real diff, and run a one-time self-review pass. Trigger on "have all PR comments been addressed", "did copilot and…

anchildress1/awesome-github-copilot · 162 tokens

changelog-rewriter

Rewrites changelog entries with cheeky, narrative flair following project conventions. Use this when asked to rewrite or update CHANGELOG.md entries.

anchildress1/awesome-github-copilot · 33 tokens