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 romiluz13/cc10x --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/romiluz13/cc10xWrote 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/romiluz13/cc10x/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/romiluz13/cc10x/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/romiluz13/cc10x/resolving-merge-conflicts/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/romiluz13/cc10x/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/romiluz13/cc10x/resolving-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 1 finding, up to medium
These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →
- medium MCP Rug Pull · line 50 npx commands without a version suffix (e.g. @1.0.0) create a rug-pull risk if the upstream server is compromised and publishes a malicious update.Fix: Pin the version: npx @scope/[email protected]
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.00025 | $0.00692 |
| Opus 5.5 | $0.00010 | $0.00277 |
| Sonnet 5.5 | $0.00005 | $0.00138 |
| Haiku 4.5 | $0.00003 | $0.00069 |
Grade A, and why
resolving-merge-conflicts 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.
How it starts
The opening of the file, as written. The whole thing — 72 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolving Merge Conflicts
Work through an in-progress git merge or rebase conflict hunk by hunk, resolving each by intent traced to each side's primary source. Never --abort. Always resolve; --abort throws away work and hides the real incompatibility.
The 5 steps
1. See the current state
Check git status, the conflicting files, and the conflict markers:
git status
git diff --name-only --diff-filter=U # the unmerged paths
Read each conflicting file's conflict markers (<<<<<<<, =======, >>>>>>>) to see exactly what's contested. Know whether you're in a merge (MERGE_HEAD set) or a rebase (rebase-merge/ or rebase-apply/ present in .git/).
2. Find the primary sources for each side
For each conflict hunk, understand why each change was made and what its original intent was — don't just pick the bigger diff. Read:
- The commit messages on both sides (
git log --oneline -5 -- <file>for each side) - The PRs or issues/tickets the commits reference
- The surrounding code to confirm what each side was trying to achieve
3. Resolve each hunk by intent
For each hunk:
- Preserve both intents where possible — the two sides usually want different things; merge both.
- Where incompatible, pick the one matching the merge's stated goal (the feature, the fix, the branch's purpose) — never pick one side blind — and note the trade-off in the commit message: what was given up and why.
- Never invent new behavior. A conflict resolution is not a place to add new code neither side wrote.
4. Run the project's automated checks
Discover the project's checks and run them in order — typically typecheck, then tests, then format:
# node: npx tsc --noEmit (or per package.json scripts)
# python: ruff check . && python -m pytest -q
# go: go build ./... && go test ./...
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 · 72 lines · 25 tokens per session scan A bbf4a5364048
resolving-merge-conflicts is a skill published in the GitHub repository romiluz13/cc10x (165 stars, last pushed today), licensed MIT. It adds 25 tokens to every session and 692 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-investigate
Git history investigation. Use when: tracking code changes, finding where bugs were introduced, root cause analysis. Not for: code exploration (use code-explore), issue analysis (use issue-analyze). Output: history trace + root cause report.
push-ci
Push to remote and monitor CI. Validates branch safety, executes git push WITH explicit user approval, then monitors CI run status via gh CLI. Use when: user says 'push', 'push and watch CI', 'ship it', 'push-ci'. Not for: committing (use /smart-commit), creating PRs (use /create-pr), merging (use /merge-prep).
gh-stack
Native stacked pull requests through the github/gh-stack extension. Detects the extension, installs it only after the user approves, resolves the branch chain, and executes gh stack link / gh stack push / gh stack submit --auto under a per-use AskUserQuestion gate. Use when: opening or refreshing a native stack of…
smart-rebase
Smart partial rebase for squash-merge repositories. Auto-detect which commits to keep/drop when base branch was squash-merged into target. Use when: user says 'rebase', 'partial rebase', 'base already merged', 'smart rebase', or /smart-rebase. Not for: simple git rebase (the developer runs it — no skill executes…
issue-analyze
GitHub Issue and PR review thread deep analysis with Codex blind verdict. Use when: analyzing issue root cause, classifying problems, investigation planning, triaging PR review comments for actionability. Not for: fixing bugs (use bug-fix), code exploration (use code-explore). Output: classified analysis + verdict…
debug
Interactive debugging workflow with hypothesis-driven probe loop. Use when: unknown bugs, script errors, silent failures, troubleshooting. Not for: known bugs (use bug-fix), GitHub issue analysis (use issue-analyze), code understanding (use code-explore). Output: debug report with probe journal + root cause + fix.