carbon: Skill for Claude Code

.claude/skills/resolving-merge-conflicts/SKILL.md

resolving-merge-conflicts is a skill for Claude Code, Codex from crbnos/carbon. It costs 23 tokens per session (204 once invoked), scanned A, original, no licence file.

A guide for handling conflicts during a Git merge or rebase. A conflict happens when Git cannot safely combine changes made in different branches.

In plain words
What is it for?
It is for inspecting conflicting changes, choosing the correct result, and finishing the merge or rebase.
Why use it?
It helps complete an interrupted merge or rebase instead of leaving the repository in a conflicted state.

Skill for Claude CodeCodex

Written for Claude Code and Codex: installed under .claude/, but also agents/openai.yaml present.

This is crbnos/carbon's own configuration. It tells Claude Code and Codex how to work on carbon itself, so it is not a mod to install elsewhere. Copy it as a starting point and replace the rules that are about this project. Everything carbon configures →

Reuse

Borrowing it

Nothing to install: this file belongs to crbnos/carbon. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file
curl -O https://raw.githubusercontent.com/crbnos/carbon/main/.claude/skills/resolving-merge-conflicts/SKILL.md
Clone the repo
git clone --depth 1 https://github.com/crbnos/carbon

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 resolving-merge-conflicts

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/crbnos/carbon/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/crbnos/carbon/resolving-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 23 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 204 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.00023 $0.00204
Opus 5.5 $0.00009 $0.00082
Sonnet 5.5 $0.00005 $0.00041
Haiku 4.5 $0.00002 $0.00020

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

Security

Grade A, and why

resolving-merge-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 25d 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/resolving-merge-conflicts/SKILL.md · 15 lines

The source is not reproduced here

A licence we could not identify

The repository carries a LICENSE file, but it is custom or dual enough that GitHub cannot name it and neither can this catalogue. Unknown terms are not permission, so the body is not copied here. Read the licence at the source and decide for yourself.

Read it on GitHub

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. 25d ago First seen · 15 lines · 23 tokens per session scan A 9d8114f8ef0b

Subscribe to this mod's changes

resolving-merge-conflicts is a skill published in the GitHub repository crbnos/carbon (2,783 stars, last pushed today), with no licence file. It adds 23 tokens to every session and 204 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-05.

Related

Other skills, from other repositories

repo-practicing-trunk-based-development

Trunk Based Development workflow - all development on main branch with small frequent commits, minimal branching, and continuous integration. Covers when branches are justified (exceptional cases only), commit patterns, feature flag usage for incomplete work, environment branch rules (deployment only), and AI agent…

wahidyankf/ose-public · 128 tokens

pr-review-fixer-resolution

How pr-review-fixer enumerates unresolved GitHub PR review threads, triages each into fix/reject/defer/clarify, applies the outcome, and resolves only what was genuinely addressed. Use when resolving threads posted by pr-review-checker's consolidated review.

wahidyankf/ose-public · 58 tokens

docs-managing-file-operations

Complete methodology for safely renaming, moving, and deleting files/directories in docs/ — file naming review, the four-phase systematic process, deletion safety, link updates, git operations, index updates, validation checklists, safety guidelines, edge cases, and integration with other agents. Backs the…

wahidyankf/ose-public · 71 tokens

create-worktree-skill

Use when the user explicitly asks for a SKILL to create a worktree. If the user does not mention "skill" or explicitly request skill invocation, do NOT trigger this. Only use when user says things like "use a skill to create a worktree" or "invoke the worktree skill". Creates isolated git worktrees with…

lroy-stack/ai-pod-store · 77 tokens

worktree-manager-skill

Comprehensive git worktree management. Use when the user wants to create, remove, list, or manage worktrees. Handles all worktree operations including creation, deletion, and status checking.

lroy-stack/ai-pod-store · 44 tokens

update-skills

Create or update repository skills and instructions when major learnings are discovered during a session. Use when the user says "learn!", when a significant pattern or pitfall is identified, or when reusable domain knowledge should be captured for future sessions.

microsoft/vscode · 51 tokens