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 jamesyang124/agent-skills --skill git-rebase-conflict-resolvergit clone --depth 1 https://github.com/jamesyang124/agent-skillsWrote 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/jamesyang124/agent-skills/git-rebase-conflict-resolver)<a href="https://agentmods.dev/skills/jamesyang124/agent-skills/git-rebase-conflict-resolver"><img src="https://agentmods.dev/badge/skills/jamesyang124/agent-skills/git-rebase-conflict-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.
<a href="https://agentmods.dev/skills/jamesyang124/agent-skills/git-rebase-conflict-resolver"><img src="https://agentmods.dev/badge/skills/jamesyang124/agent-skills/git-rebase-conflict-resolver.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.00082 | $0.01401 |
| Opus 5 | $0.00041 | $0.00700 |
| Sonnet 5 | $0.00016 | $0.00280 |
| Haiku 4.5 | $0.00008 | $0.00140 |
Grade A, and why
git-rebase-conflict-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 9d 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.
How it starts
The opening of the file, as written. The whole thing — 139 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Rebase Conflict Resolver
Three modes — all generate a report:
- Dry-run mode: predicts which commits and files would conflict without touching the branch. Zero side effects.
- Progressive mode (default): interactive per-conflict — analysis + named approaches for every file. You decide each resolution. Generates a resolution summary at the end.
- Auto mode: resolves all conflicts autonomously, tracks every decision, presents a full audit report for approval or rollback.
Usage
/git-rebase-conflict-resolver # prompts for mode
/git-rebase-conflict-resolver --dry-run # conflict prediction report, no changes
/git-rebase-conflict-resolver --progressive # interactive per-conflict
/git-rebase-conflict-resolver --auto # autonomous resolution + audit report
Arguments
All optional.
| Token / flag | Meaning |
|---|---|
--dry-run |
predict conflicting commits and files; never touch the branch |
--progressive |
interactive per-conflict resolution (default) |
--auto |
resolve autonomously, then present an audit report to approve or roll back |
| any other bare token | rebase target branch |
No mode flag → the Mode Selection prompt runs. No branch token → the Target Branch Selection prompt runs.
Mode Selection (when no flag given)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
Git Rebase Conflict Resolver
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
[D] Dry-run mode
Predict which commits and files would conflict — no branch changes.
Generates a conflict prediction report.
[P] Progressive mode (default)
Analyze each conflict interactively. You choose every resolution.
Generates a resolution report at the end.
[A] Auto mode
Resolve all conflicts autonomously. Review audit report at the end
and approve or roll back the entire rebase.
Select mode [D/P/A]:
Enter with no input → Progressive.
Target Branch Selection (all modes)
What ships with it
3 files 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.
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.
- 9d ago First seen · 139 lines · 82 tokens per session scan A 46bcd4d81ebb
git-rebase-conflict-resolver is a skill published in the GitHub repository jamesyang124/agent-skills (2 stars, last pushed 1mo ago), licensed MIT. It adds 82 tokens to every session and 1,401 once invoked, about $0.0004 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.
Other skills, from other repositories
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
re0-merge
Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…
nvca-chart-release
Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.