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.
git clone --depth 1 https://github.com/Sagargupta16/claude-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/commands/sagargupta16/claude-skills/resolve-conflict)<a href="https://agentmods.dev/commands/sagargupta16/claude-skills/resolve-conflict"><img src="https://agentmods.dev/badge/commands/sagargupta16/claude-skills/resolve-conflict/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/commands/sagargupta16/claude-skills/resolve-conflict"><img src="https://agentmods.dev/badge/commands/sagargupta16/claude-skills/resolve-conflict.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.00011 | $0.00177 |
| Opus 5 | $0.00005 | $0.00088 |
| Sonnet 5 | $0.00002 | $0.00035 |
| Haiku 4.5 | $0.00001 | $0.00018 |
Grade A, and why
resolve-conflict 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 5d 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
Resolve merge conflicts in the current branch.
Steps:
- Run
git statusto identify conflicted files - For each conflicted file:
- Read the conflict markers
- Check
git log --onelinefor both branches to understand intent - Determine the correct resolution (keep both, choose one, or rewrite)
- Present the proposed resolution for each file before applying
- After user approval, resolve conflicts and stage the files
- If in a rebase:
git rebase --continue - If in a merge:
git merge --continue - Run tests to verify the resolution is correct
Do NOT blindly accept "ours" or "theirs". Read both sides and merge intentionally.
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.
- 5d ago Changed d60e936ea3ef
- 12d ago First seen · 21 lines · 11 tokens per session scan A b71b0d8c2ad5
resolve-conflict is a command published in the GitHub repository Sagargupta16/claude-skills (5 stars, last pushed 6d ago), licensed MIT. It adds 11 tokens to every session and 177 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.
Other commands, from other repositories
commit
Create a git commit with intelligent message drafting (-f for fast, -v for verbose).
speckit.taskstoissues
Convert existing tasks into actionable, dependency-ordered GitHub issues for the feature based on available design artifacts.
clean-gone
Clean up local branches that have been deleted from the remote repository.
commit-push-pr
Complete workflow — commit, push, and create a pull request in one step.
commit
Create a git commit with an automatically generated message based on staged and unstaged changes.
adk-ts-changelog
Generate changelog entries and community release notes for ADK-TS from git history and changesets.