Borrowing it
Nothing to install: this file belongs to AlexisBalayre/claude-code-power-config. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/AlexisBalayre/claude-code-power-config/main/.claude/skills/resolve-merge-conflicts/SKILL.mdgit clone --depth 1 https://github.com/AlexisBalayre/claude-code-power-configWrote 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/alexisbalayre/claude-code-power-config/resolve-merge-conflicts)<a href="https://agentmods.dev/skills/alexisbalayre/claude-code-power-config/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/alexisbalayre/claude-code-power-config/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/alexisbalayre/claude-code-power-config/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/alexisbalayre/claude-code-power-config/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.00033 | $0.00427 |
| Opus 5.5 | $0.00013 | $0.00171 |
| Sonnet 5.5 | $0.00007 | $0.00085 |
| Haiku 4.5 | $0.00003 | $0.00043 |
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 2mo 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
-
See the current state of the merge/rebase:
git status, the history of both sides, and the conflicting files. -
Find the primary sources for each conflict. Understand deeply why each change was made and what the original intent was. Read the commit messages and the PRs (
gh pr view); PR bodies carryCloses PROJ-XXXX, so fetch the tracker issue when the intent is still unclear. -
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Regenerate, don't hand-merge. Conflict markers in generated files are never resolved by hand:
pnpm-lock.yaml: take either side wholesale, then re-runpnpm installto regenerate.- Drizzle migrations and
packages/acme-db/src/migrations/meta/_journal.json: drop this branch's generated migration, re-runpnpm db:generateagainst the merged schema, thenbiome check --writethe_journal. - Any other generated artifact (schema diagrams, generated API references, gRPC stubs): re-run its generator against the merged sources; never edit the output.
-
Run the tests for the affected packages and fix anything the merge broke (formatting and typechecking run automatically via the Stop hook). The pre-commit hook lints, typechecks, and tests the whole repo; failures that already exist on the base branch are not the merge's fault, and
--no-verifyis acceptable only for those. -
Finish the merge/rebase. Stage everything and commit. If rebasing, continue (
git rebase --continue) until all commits are rebased.
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.
- 2mo ago First seen · 22 lines · 33 tokens per session scan A ae91080e7168
resolve-merge-conflicts is a skill published in the GitHub repository AlexisBalayre/claude-code-power-config (2 stars, last pushed 1mo ago), licensed MIT. It adds 33 tokens to every session and 427 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-31.
Other skills, from other repositories
fork-fleet
Fork divergence monitor - tracks where the fleet's active forks diverge in CODE (unique commits, new/modified skills) and CONFIG (enable/var/model/schedule vs upstream), gated on real change.
pr-review
Review open PRs two ways - default is a per-PR deep review with severity-tagged findings, inline comments, and a verdict; --survey runs a risk-tiered triage digest of what's safe to merge first.
aeon-update
Pull framework updates from the upstream Aeon repo into this instance - 3-way merges canon's new commits into a PR, never clobbering operator config.
github-monitor
Watch your GitHub repos across four views - a combined urgency monitor (stale PRs, new issues, releases), a new-issue triage queue, a release upgrade digest, or your own opened-PR tracker.
pack-submit
Package one of this agent's own skills as a standalone community pack and submit it to the aeon registry as a PR.
shiplog
Recap of everything shipped since the last run - cross-repo PRs, security fixes, star deltas, and X traction, synthesized into a digest article and a ready-to-post shiplog in your voice.