roll-resolve

roll-resolve is a skill for Claude Code, Codex from sumimakito/roll. It costs 29 tokens per session (368 once invoked), scanned A, original, MIT.

A procedure for resolving conflicts between a GitHub pull request branch and its base branch. A pull request is a proposed code change, and a conflict means Git cannot safely combine both sets of edits automatically.

In plain words
What is it for?
Use it to rebase or merge a pull request, classify conflicts, safely resolve mechanical ones, and prepare a clean branch for verification.
Why use it?
It prevents behavior from being changed accidentally while conflicts are resolved. Unsafe overlapping logic is handed back for a human decision.

Skill for Claude CodeCodex

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.

agentmods
npx agentmods add skills/sumimakito/roll/roll-resolve
Any agent
npx skills add sumimakito/roll --skill roll-resolve
Clone the repo
git clone --depth 1 https://github.com/sumimakito/roll

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 roll-resolve

README.md
[![agentmods](https://agentmods.dev/badge/skills/sumimakito/roll/roll-resolve.svg)](https://agentmods.dev/skills/sumimakito/roll/roll-resolve)
Your own site
<a href="https://agentmods.dev/skills/sumimakito/roll/roll-resolve"><img src="https://agentmods.dev/badge/skills/sumimakito/roll/roll-resolve.svg" alt="Measured on agentmods" 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 368 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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 $0.00029 $0.00368
Opus 5 $0.00015 $0.00184
Sonnet 5 $0.00006 $0.00074
Haiku 4.5 $0.00003 $0.00037

Measured 4d ago against content hash 305d844e1097, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

roll-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 4d 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/roll/roll-resolve/SKILL.md · 34 lines

What it actually says

roll-resolve

Integrate base using the confirmed STRATEGY. Resolve only conflicts that can preserve both sides' intent. For semantic conflicts, stop and hand off.

Procedure

  1. Fetch and integrate base:
    • rebase: git fetch origin <base> && git rebase origin/<base>
    • merge: git fetch origin <base> && git merge origin/<base> Do not choose strategy here; roll already confirmed it.
  2. Classify conflicts:
    • Auto-resolve: lockfiles, generated files, import ordering, and strictly non-overlapping hunks where keeping both preserves intent.
    • Take-over: overlapping logic edits, semantic conflicts, or any resolution requiring behavior choice or intent guessing.
  3. Auto-resolve only safe conflicts. Regenerate lockfiles when practical; state what changed and why intent is preserved.
  4. For take-over conflicts, stop. Show file/hunk and why it is unsafe; let the user resolve it or give explicit per-file instructions. Wait for completion.
  5. When conflict-free, continue: git rebase --continue or commit the merge.
  6. Output a clean tree ready for roll-verify, or a handoff list of unresolved take-over conflicts.

Stop Rules

  • Do not edit semantic conflicts without explicit per-file instruction.
  • Do not treat handoff as failure.
  • Do not hand-edit lockfiles when regeneration is available.
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. 4d ago First seen · 34 lines · 29 tokens per session scan A 305d844e1097

Subscribe to this mod's changes

roll-resolve is a skill published in the GitHub repository sumimakito/roll (2 stars, last pushed 3mo ago), licensed MIT. It adds 29 tokens to every session and 368 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

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens