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 HECer/yoke --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/HECer/yokeWrote 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/hecer/yoke/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/hecer/yoke/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/hecer/yoke/resolving-merge-conflicts.svg" alt="Measured on agentmods" 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.00053 | $0.00232 |
| Opus 5 | $0.00026 | $0.00116 |
| Sonnet 5 | $0.00011 | $0.00046 |
| Haiku 4.5 | $0.00005 | $0.00023 |
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 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.
What it actually says
Resolving merge conflicts
- Inspect the current merge or rebase state, history, and every conflicted file.
- Trace both sides to their commits and available pull request, issue, specification, and test evidence. Identify what each change was trying to preserve.
- Resolve each hunk. Preserve both intents when compatible. When they conflict, follow the current operation's stated goal and report the trade-off. Do not invent unrelated behavior.
- Discover and run the project's scoped checks, then the broader checks justified by the merge.
- Stage resolved files and continue the current operation until Git reports it complete.
Keep all process actions scoped to the current repository and recorded operation. Never abort a merge or rebase unless the user explicitly requests that destructive reversal. Stop for direction when the evidence cannot distinguish two materially different product behaviors.
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 · 19 lines · 53 tokens per session scan A d098403cbd17
resolving-merge-conflicts is a skill published in the GitHub repository HECer/yoke (2 stars, last pushed yesterday), licensed MIT. It adds 53 tokens to every session and 232 once invoked, about $0.0003 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
commit
Create commit messages following Sentry conventions. Use when committing code changes, writing commit messages, or formatting git history. Follows conventional commits with Sentry-specific issue references.
create-pr
Create pull requests following Sentry conventions. Use when opening PRs, writing PR descriptions, or preparing changes for review. Follows Sentry's code review guidelines.
intuitive-squash
Squash local GSD or agent-generated commit history into a clean, reviewable story while preserving important fixes. Use when the user asks to squash commits, clean git history, compress phase commits, prepare a branch before PR, compare aggressive vs moderate squash options, or preserve hotfix/security commits during…
codex-review
Professional code review with auto CHANGELOG generation, integrated with Codex AI.
intuitive-port-worktree
Port changes from one git worktree or checkout into the default repository folder's current branch, then by default sync the result to the remote default branch when everything is clean. Use when the user asks to move, copy, transfer, transplant, cherry-pick, apply a patch, or port worktree changes into the…
ship
Create branch, commit changes, and open PR with concise description. Triggers on "ship", "open pr", "send pr".