resolver

resolver is a skill for Claude Code, Codex from sipyourdrink-ltd/bernstein. It costs 11 tokens per session (284 once invoked), scanned A, original, Apache-2.0.

A skill for resolving Git merge conflicts, which happen when concurrent changes overlap and Git cannot choose which version to keep.

In plain words
What is it for?
Use it to inspect conflict markers, combine compatible changes, choose between incompatible changes, verify the result, and stage the resolved files.
Why use it?
It helps preserve the intent of both branches while checking that the resolved code still builds, passes type checks, and passes tests.

Skill for Claude CodeCodex

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

Good fit Use it to inspect conflict markers, combine compatible changes, choose between incompatible changes, verify the result, and stage the resolved files.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/sipyourdrink-ltd/bernstein/resolver
About the project

Bernstein is an open-source governance layer for AI agents that applies written policies, schedules agent work deterministically, controls approvals, and records verifiable execution history. It is used to coordinate CLI coding agents and other agent workloads, including parallel runs and offline review, while the catalogue entries provide its agent workflows and controls.

sipyourdrink-ltd/bernstein · 1,328 stars · on GitHub · bernstein.run

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 sipyourdrink-ltd/bernstein --skill resolver
Clone the repo
git clone --depth 1 https://github.com/sipyourdrink-ltd/bernstein

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 resolver

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/sipyourdrink-ltd/bernstein/resolver"><img src="https://agentmods.dev/badge/skills/sipyourdrink-ltd/bernstein/resolver.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 11 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 284 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. Third-party audits
  • NVIDIA SkillSpector pass 7 Sept 2026
How audits are shown
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.00011 $0.00284
Opus 5.5 $0.00004 $0.00114
Sonnet 5.5 $0.00002 $0.00057
Haiku 4.5 $0.00001 $0.00028

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

Security

Grade A, and why

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 1mo 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.

templates/skills/resolver/SKILL.md · 39 lines

What it actually says

Merge Conflict Resolver Skill

You resolve git merge conflicts between concurrent agent branches.

Specialization

  • Reading both sides of a merge conflict to understand intent.
  • Determining which changes to keep, combine, or rewrite.
  • Preserving correctness from both branches.
  • Ensuring the resolved code compiles, passes types, and maintains tests.

Work style

  1. Read the conflict markers and surrounding context for each file.
  2. Understand what each side was trying to accomplish.
  3. Resolve by combining both intents where possible; pick one side only when they are truly incompatible.
  4. After resolving all conflicts, run any available tests to verify.
  5. Stage resolved files and commit.

Rules

  • Only modify files listed in your task's owned_files (the conflicting files).
  • Never discard changes silently - if you drop one side, explain why in the commit message.
  • Prefer combining both sides over picking a winner.
  • If a conflict is ambiguous and cannot be safely resolved, mark the task as failed with a clear explanation.
  • Do not refactor, optimize, or "improve" code beyond what is needed to resolve the conflict.
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. 1mo ago First seen · 39 lines · 11 tokens per session scan A cfa773d3cae7

Subscribe to this mod's changes

resolver is a skill published in the GitHub repository sipyourdrink-ltd/bernstein (1,328 stars, last pushed today), licensed Apache-2.0. It adds 11 tokens to every session and 284 once invoked, about $0.0000 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.

Related

Other skills, from other repositories

resolve-merge-conflicts

Resolve Git merge conflicts in a Calkit project, including dvc.lock, stage run records, and pipeline outputs. Use when the user invokes /calkit:resolve-merge-conflicts, asks to merge a branch, or a merge, pull, or rebase stopped with conflicts.

calkit/calkit · 65 tokens

commit

Skill "commit" from markmhendrickson/neotoma, covering commit, parameter detection and routing, check if parameter provided, single submodule commit workflow and all submodules commit workflow.

markmhendrickson/neotoma · 3 tokens

process_prs

Use this skill to work the open PR queue end-to-end: assess merge readiness, run security gates, selectively request Claude Opus review on substantial PRs, merge eligible PRs, and hand off release PRs to /release.

markmhendrickson/neotoma · 7 tokens

create-release

Skill "create-release" from markmhendrickson/neotoma, covering create new release, when to use, prerequisites, command execution and step 1: load documentation.

markmhendrickson/neotoma · 6 tokens

create_pr

Open a high-quality pull request with a standardized description (Problems / Solutions / UX improvements / Documentation / Test plan / Breaking changes), the changeguardrailsrules.md pre-PR checklist enforced, and thorough functional-change documentation under docs/ surfaced via the docs server and docs site. Use this…

markmhendrickson/neotoma · 98 tokens

publish

Skill "publish" from markmhendrickson/neotoma, covering publish, release numbering strategy, parameter detection and routing, check if parameter provided and submodule publish workflow.

markmhendrickson/neotoma · 3 tokens