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 duc01226/EasyPlatform --skill git-conflict-resolvegit clone --depth 1 https://github.com/duc01226/EasyPlatformWrote 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/duc01226/easyplatform/git-conflict-resolve)<a href="https://agentmods.dev/skills/duc01226/easyplatform/git-conflict-resolve"><img src="https://agentmods.dev/badge/skills/duc01226/easyplatform/git-conflict-resolve/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/duc01226/easyplatform/git-conflict-resolve"><img src="https://agentmods.dev/badge/skills/duc01226/easyplatform/git-conflict-resolve.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.00032 | $0.03075 |
| Opus 5.5 | $0.00013 | $0.01230 |
| Sonnet 5.5 | $0.00006 | $0.00615 |
| Haiku 4.5 | $0.00003 | $0.00308 |
Grade A, and why
git-conflict-resolve 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 3d 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.
This is a copy
86% identical to template-skill — 254 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
How it starts
The opening of the file, as written. The whole thing — 277 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Codex compatibility note:
- Invoke
$skill-name: load the registered.agents/skills/<name>/SKILL.mdand execute it with Codex tools; no separateSkilltool or Claude mode switch is needed. Author.claude/**; mirrors are generated.- Track steps before execution and keep progress/evidence current. Explicit skill requests execute their protocol. Use the native question tool for required questions.
- Map foreign tool names to available host capabilities. A name mismatch needs no approval; an actually unavailable required capability stops with its step/evidence and a user question before adaptation.
- Subagent authorization: when a skill is user-invoked or AI-detected and its protocol requires subagents, that skill activation authorizes use of the required
spawn_agentsubagent(s) for that task.- Preserve protocol order unless the user approves a deviation. Workflows use
$start-workflow: gates stay fixed; other steps may flex with logged reasons and evidence.
Quick Summary
Goal: Resolve git merge/cherry-pick/rebase conflicts with backup, analysis, and structured reporting.
Summary: Detect the operation and conflict paths → back up distinct paths → analyze both sides and callers → resolve → verify → hand off or continue under caller authority → report → final review. Preserve recovery files and the owning review/commit gate.
Workflow:
- Backup — Create safety backup of current state
- Analyze — Identify conflict types and affected files
- Resolve — Apply resolution strategy per conflict
- Report — Generate conflict resolution report
Key Rules:
- Always create backup before resolving conflicts
- Prefer preserving both sides' intent over arbitrary choice
- Generate resolution report for audit trail
Be skeptical. Apply critical thinking, sequential thinking. Every claim needs traced proof, confidence percentages (Idea should be more than 80%).
Contents
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.
- 3d ago Changed · -184 lines 205c8af5550b
- 1mo ago First seen · 461 lines · 32 tokens per session scan A fb779bf85ea3
git-conflict-resolve is a skill published in the GitHub repository duc01226/EasyPlatform (12 stars, last pushed yesterday), licensed MIT. It adds 32 tokens to every session and 3,075 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 86% identical to template-skill, differing in 254 lines, and is treated as a copy.
Other skills, from other repositories
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
enable-check-includes-strict
Enable and migrate Chromium targets and directories to checkincludesstrict = true, diagnosing and resolving header include violations as part of the checkincludesstrict LSC. Use when adding directories to the allowlist, enabling strict header checks on targets, or resolving CHECKINCLUDESSTRICTUNTRIAGED targets.
resolve-handoff
Emit the complete Resolve handoff with exact modes, outcomes, test evidence, and publication state.
reproduce-and-fix-issues
Reproduce triaged Slack bugs through a configured app-control adapter, verify existing fixes, and open a bounded draft pull request only after before-and-after proof. Use only from the configured Benny repro automation.
cy-orquestrate-issue
Orchestrate GitHub bug resolution through a new CompozyOS managed worktree and Codex Astra High session per issue. Investigate reported bugs, create missing issues, and dispatch a Goal-backed executor responsible for a detailed PR, green CI, and all CodeRabbit and Greptile feedback. Use when asked to delegate issue…