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.
npx skills add pedrol-cmd/brain-drin --skill drin-git-rebase-conflict-solvergit clone --depth 1 https://github.com/pedrol-cmd/brain-drinWrote 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.
[](https://agentmods.dev/skills/pedrol-cmd/brain-drin/drin-git-rebase-conflict-solver)<a href="https://agentmods.dev/skills/pedrol-cmd/brain-drin/drin-git-rebase-conflict-solver"><img src="https://agentmods.dev/badge/skills/pedrol-cmd/brain-drin/drin-git-rebase-conflict-solver/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.
<a href="https://agentmods.dev/skills/pedrol-cmd/brain-drin/drin-git-rebase-conflict-solver"><img src="https://agentmods.dev/badge/skills/pedrol-cmd/brain-drin/drin-git-rebase-conflict-solver.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00026 | $0.00179 |
| Opus 5 | $0.00013 | $0.00089 |
| Sonnet 5 | $0.00005 | $0.00036 |
| Haiku 4.5 | $0.00003 | $0.00018 |
Grade A, and why
drin-git-rebase-conflict-solver 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 6d 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.
What it actually says
Git Rebase Conflict Solver
Purpose
To maintain a clean git history while ensuring code integrity during complex merges.
Workflow
- Abort/Backup: If lost,
git rebase --abort. Create a backup branch. - Rebase:
git rebase [target]. - Conflict Identification: Open files with
<<<<<<<markers. - Resolution: Apply logic to merge both changes correctly.
- Continue:
git add .andgit rebase --continue.
Rules
- Never use
-f(force) on shared branches without team sync. - Verify the build/tests after every conflict resolution step.
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.
- 6d ago First seen · 22 lines · 26 tokens per session scan A 9c3b9fea97ea
drin-git-rebase-conflict-solver is a skill published in the GitHub repository pedrol-cmd/brain-drin (11 stars, last pushed 5mo ago), licensed MIT. It adds 26 tokens to every session and 179 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-09-03.
Other skills, from other repositories
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
bisect
Bisect regressions or broken builds in the Chromium repository using deterministic binary search, checking out midpoint commits, syncing dependencies with gclient sync, compiling the target with autoninja, and querying the user for test results until the culprit commit is isolated.
mantis-critic
Assesses the production viability of findings, filtering out debug-only features and assertion traps. Use when findings have been validated and you need to confirm they are triggerable in production release builds (with assertions disabled). Don't use for writing reproduction scripts or patches.
hotpath_bump
Bump the hotpath version number across the workspace and related files. Updates crate versions in Cargo.toml files (exact patch version) and version references in the backend middleware, hotpathinit skill, and README (major.minor only). Use when the user wants to bump, bump the version, or release a new hotpath…
comet-github-issue-fix
A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.