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 codebygarv/Ai-skills --skill git-conflict-resolvergit clone --depth 1 https://github.com/codebygarv/Ai-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/codebygarv/ai-skills/git-conflict-resolver)<a href="https://agentmods.dev/skills/codebygarv/ai-skills/git-conflict-resolver"><img src="https://agentmods.dev/badge/skills/codebygarv/ai-skills/git-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/codebygarv/ai-skills/git-conflict-resolver"><img src="https://agentmods.dev/badge/skills/codebygarv/ai-skills/git-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.00026 | $0.00367 |
| Opus 5.5 | $0.00010 | $0.00147 |
| Sonnet 5.5 | $0.00005 | $0.00073 |
| Haiku 4.5 | $0.00003 | $0.00037 |
Grade A, and why
git-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 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.
What it actually says
Purpose
Resolve difficult, tangled Git merge and rebase conflicts by analyzing both branches' underlying intent, syntax AST changes, import reorganizations, and semantic context rather than blindly picking incoming vs current changes.
When to Use
- Resolving massive merge conflicts after rebasing a long-lived feature branch onto main.
- Reconciling concurrent refactorings (e.g. one branch renamed a function, another branch added new calls to it).
- Fixing lockfile conflicts (
pnpm-lock.yaml,package-lock.json,Cargo.lock).
What to Analyze
- Branch Intent Analysis: What did Branch A (Incoming) change and why? What did Branch B (Current) change and why?
- Syntactic Merging: Harmonizing import statements, exports, and interface definitions from both branches.
- Semantic Collision Detection: Identifying code that merges cleanly with git text tools but introduces semantic runtime errors (e.g. caller uses old signature).
- Lockfile Reconstruction: Never manually edit lockfile conflict markers; regenerate deterministically via package manager.
- Post-Resolution Verification: Running typecheck and tests to prove the merge resolved correctly.
Output Format
- Conflict Intent Breakdown: What both sides were attempting to do.
- Resolved Code: Complete, syntax-error-free unified code.
- Lockfile Resolution Command: Exact CLI command to cleanly rebuild lockfiles.
Avoid
- Discarding legitimate changes from either branch without understanding why they were made.
- Leaving unresolved git conflict markers (
<<<<<<<,=======,>>>>>>>) in code.
What ships with it
2 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.
- 1mo ago First seen · 34 lines · 26 tokens per session scan A dcce56239a94
git-conflict-resolver is a skill published in the GitHub repository codebygarv/Ai-skills (27 stars, last pushed 2mo ago), licensed MIT. It adds 26 tokens to every session and 367 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-08-30.
Other skills, from other repositories
git-pr
PR and MR workflows for GitHub (gh) and GitLab (glab). Creation, review comment handling, thread resolution, review state queries, merging, cost-aware bot review rounds (GitHub: Copilot, CodeRabbit), and Copilot code review configuration (rulesets, custom instructions, billing). Use when creating PRs/MRs, addressing…
git-project
GitHub Projects (v2) setup and management via gh CLI + GraphQL: organize a repo's issues into epics with native sub-issues, drive a board Status flow (Todo -> In Progress -> Done), set Project Priority, classify with native issue Types (Task/Bug/Feature) instead of labels, scope work with milestones (incl. resolving…
git-commit
Conventional Commits format for git commits and PR/MR titles. Type prefixes, scope rules, breaking change syntax, and commit message structure. Use when committing changes, writing commit messages, creating PR/MR titles, or formatting squash merge messages. Not for PR workflows (git-pr), CI/CD status (git-ci), or git…
bun-api
Bun runtime API reference for TypeScript scripts. Covers Bun.serve() HTTP/HTTP/2 server with routes and WebSockets, fetch() transport options, proxies and Bun.FetchSession connection pools, Bun.ModuleGraph multi-instance apps, Bun.file(), Bun.write(), Bun.$() shell, Bun.spawn(), Bun.Glob, Bun.env, bun:sqlite…
bun-cli
Bun CLI reference for package management, script running, type checking, testing, bundling, and compilation. Covers bun install/add/remove/update, bun run, bun check and --check, bun test, bun build, bunx, bun patch, bun audit fix, bun dedupe, bun prune, bun why, bun pm, bun repl, bunfig.toml, bun.lock, workspace…
deps-upgrade
Validate JavaScript/TypeScript dependency upgrades after an interactive or manual update. Establish the real delta from git, detect peer/engine/type conflicts, extract breaking changes, migrations and adoptable features from release notes, assess held-back or seemingly unused packages, and run verification gates.…