cartographer-kb-conflict-resolve

cartographer-kb-conflict-resolve is a skill for Claude Code, Codex from BeppeTemp/cartographer. It costs 24 tokens per session (955 once invoked), scanned A, original, Apache-2.0.

A guided procedure for resolving Git rebase conflicts in a knowledge base. A rebase reapplies local commits on top of newer remote commits, and a conflict means both versions changed the same content in incompatible ways.

In plain words
What is it for?
Use it to list open conflicts, read each affected concept, compare the versions, choose the correct content, and complete the repair.
Why use it?
It helps return affected knowledge-base entries from a degraded state to normal after synchronization fails. It makes the conflicting records and their local and remote versions explicit before resolution.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it to list open conflicts, read each affected concept, compare the versions, choose the correct content, and complete the repair.

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

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 cartographer-kb-conflict-resolve

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/beppetemp/cartographer/cartographer-kb-conflict-resolve"><img src="https://agentmods.dev/badge/skills/beppetemp/cartographer/cartographer-kb-conflict-resolve.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 24 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 955 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 original 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.00024 $0.00955
Opus 5.5 $0.00010 $0.00382
Sonnet 5.5 $0.00005 $0.00191
Haiku 4.5 $0.00002 $0.00096

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

Security

Grade A, and why

cartographer-kb-conflict-resolve 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 3d 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.

internal/skillbundle/bundled/cartographer-kb-conflict-resolve/SKILL.md · 86 lines

How it starts

The opening of the file, as written. The whole thing — 86 lines — stays where its author put it; the contents beside it link to each section on GitHub.

KB Conflict Resolve — Skill

Purpose

When a git pull --rebase conflicts with a remote commit, Cartographer registers the conflict and marks the affected concepts as status: degraded. This skill walks the agent through resolving each conflict so the KB returns to a fully operational state.

When to run this skill

Write operations fail with a message such as "git conflict detected and registered on N concept(s)", or conflicts_list returns a non-empty list. (At operator level, sync_check (not in tools/list) also reports open_conflicts > 0.)

Procedure

1. List open conflicts

Call conflicts_list (no arguments). It returns a JSON array of conflict records, each with:

  • concept_id — the ConceptID of the degraded concept (e.g. shared/notes/c)
  • local_sha — the local HEAD SHA before the rebase was attempted
  • remote_sha — the remote tip SHA after fetch
  • branch — the branch name (e.g. main)
  • files — all git paths involved in the same rebase conflict
  • detected_at — ISO-8601 timestamp of detection

2. Read the current version

For each conflicting concept, call concept_read with its concept_id. The rebase was aborted, and Cartographer marked the concept status: degraded in the working copy. The local_sha and remote_sha fields of the record name the two sides (use git show <sha> at operator level if you need to compare them directly).

3. Decide the reconciled content

Compare the content with your original intent:

  • Merge any non-conflicting additions from both sides.
  • Resolve factual discrepancies explicitly (do not silently discard either side).

4. Record a resolution for each concept

Call git_conflict_resolve once per record, with the record's concept_id and a strategy:

  • ours keeps the local version, theirs the remote one — when one side wins whole;
  • edit takes the reconciled complete file (frontmatter included, without status: degraded) in body — when you merged the two.

Read the full file on GitHub · 86 lines

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. 3d ago Changed · +1 lines acf1c975cf2c
  2. 4d ago First seen · 85 lines · 24 tokens per session scan A 6e87bab8336d

Subscribe to this mod's changes

cartographer-kb-conflict-resolve is a skill published in the GitHub repository BeppeTemp/cartographer (47 stars, last pushed today), licensed Apache-2.0. It adds 24 tokens to every session and 955 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-23.