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 nortonx/ai-tooling-free --skill resolve-merge-conflictsgit clone --depth 1 https://github.com/nortonx/ai-tooling-freeWrote 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/nortonx/ai-tooling-free/resolve-merge-conflicts)<a href="https://agentmods.dev/skills/nortonx/ai-tooling-free/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/nortonx/ai-tooling-free/resolve-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/nortonx/ai-tooling-free/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/nortonx/ai-tooling-free/resolve-merge-conflicts.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.00038 | $0.01847 |
| Opus 5.5 | $0.00015 | $0.00739 |
| Sonnet 5.5 | $0.00008 | $0.00369 |
| Haiku 4.5 | $0.00004 | $0.00185 |
Grade A, and why
resolve-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 7d 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 — 151 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve Merge Conflicts
Overview
A merge conflict occurs when two branches make conflicting assumptions about the same lines or files. Resolving a conflict means understanding the intent of both changes, reconciling them into a coherent whole, and verifying syntactic and semantic correctness before continuing.
When to Use
Use this skill when:
- Git stops during
merge,rebase,cherry-pick, orstash popwithCONFLICT (content)or unmerged paths. - Files contain conflict markers (
<<<<<<<,=======,>>>>>>>). - Machine-generated lockfiles (
package-lock.json,pnpm-lock.yaml,Cargo.lock) conflict after dependency updates. - Git status reports unmerged paths (
UU,AA,UD,DU).
Quick Reference
| Task | Command | Caveat |
|---|---|---|
| List unmerged files | git status --short (look for UU, AA, UD) |
Run first before touching code |
| Show conflict markers | git diff --check |
Detects leftover <<<<<<< markers |
| View 3-way diff | git diff |
Shows conflict blocks with local vs incoming |
| View base, ours, theirs | git show :1:<file> (base), :2:<file> (ours), :3:<file> (theirs) |
Inspect original shared ancestor |
| Stage resolved file | git add <file> |
Only after verifying syntax and tests |
| Continue operation | git merge --continue or git rebase --continue |
Never commit directly during rebase |
| Abort safely | git merge --abort or git rebase --abort |
Returns working tree to clean pre-op state |
The Rebase Inversion Trap
The meaning of --ours and --theirs depends on the operation:
| Operation | HEAD represents |
--ours refers to |
--theirs refers to |
|---|---|---|---|
git merge |
Current branch | Current branch (target) | Incoming branch (source) |
git rebase |
Upstream target commit | Upstream branch (rebase target) | Your feature branch (commit being replayed) |
In a rebase, Git checks out the upstream target and replays feature commits on top. Running git checkout --ours during a rebase discards your feature branch changes and retains upstream. Running git checkout --theirs keeps your feature branch and discards upstream.
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.
- 7d ago First seen · 151 lines · 38 tokens per session scan A 46b5f6a2f414
resolve-merge-conflicts is a skill published in the GitHub repository nortonx/ai-tooling-free (1 stars, last pushed 8d ago), licensed MIT. It adds 38 tokens to every session and 1,847 once invoked, about $0.0002 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-10-10.
Other skills, from other repositories
roblox-git-master
Use for Roblox-aware git workflows — handling Wally lock files, Rojo manifests, place file diffs, sourcemaps, generated artifacts, and Roblox-specific commit / branch / merge / rebase practices. Use when the user says "commit this", "merge this branch", "what about the place file", "wally.lock keeps changing", "set up…
spec-kitty-git-workflow
Understand how Spec Kitty manages git: what git operations Python handles automatically, what agents must do manually, worktree lifecycle, auto-commit behavior, merge execution, and the safe-commit pattern. Triggers: "how does spec-kitty use git", "worktree management", "auto-commit", "who commits what", "git…
resolve-pr-comments
This skill should be used when user asks to "address PR comments", "resolve PR feedback", "handle review comments", "fix PR issues", "respond to PR review", or explicitly invokes "resolve-pr-comments".
update-pr-summary
This skill should be used when user asks to "update PR summary", "update PR description", "rewrite PR body", "refresh PR title and body", or explicitly invokes "update-pr-summary".
om-auto-continue-pr
Resume any open PR — started by om-auto-create-pr or opened outside the pipeline. Claims it, resumes in an isolated worktree from the first unchecked step of its execution plan; a PR with no plan is adopted — the goal is reconstructed from its description, comments, review feedback, linked issues and diff, then…
spk-admin-git-workflow
Operate Spec Kitty git workflows, worktrees, safe commits, merge preflights, stale state checks, and recovery.