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 | $0.00016 | $0.00214 |
| Sonnet 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 11d 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.
- 11d 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.0002 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
security-pipeline
Use when security verification is needed - pre-commit security checks, vulnerability scanning, STRIDE threat analysis. Integrates with /handoff-verify --security and /commit-push-pr. CWE Top 25 based.
create-pr
Create evidence-backed pull requests to the GitHub main branch with strict preflight, quality, and security gates. Use when users ask to create/submit/open/update a PR to main (including private repos), decide draft vs ready state, and provide reviewer-ready context for team review.
git-commit
Safely create a git commit by validating repository state, staging intended changes, scanning for secrets/conflicts, generating a Conventional Commits message (repository convention first, else an English Angular default) from the staged diff, and committing without amend.
pr-triage
4-phase PR backlog management with audit, deep code review, validated comments, and optional worktree setup. Use when triaging pull requests, catching up on pending code reviews, or managing a backlog of open PRs. Args: 'all' to review all, PR numbers to focus (e.g. '42 57'), 'en'/'fr' for language, no arg = audit…
land-and-deploy
Merge PR, wait for CI, verify deploy, run canary. The complete landing pipeline.
git-ai-archaeology
Analyze AI config evolution in a git repo. Use when mapping AI adoption history, finding when configs were first introduced, charting commit velocity by month, or identifying maturity phases in a project's AI tooling.