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 agentmods add skills/hon454/grimoire/git-resolve-conflictsnpx skills add hon454/grimoire --skill git-resolve-conflictsgit clone --depth 1 https://github.com/hon454/grimoireWhat 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 | $0.00075 | $0.00690 |
| Opus 5 | $0.00037 | $0.00345 |
| Sonnet 5 | $0.00015 | $0.00138 |
| Haiku 4.5 | $0.00007 | $0.00069 |
Grade A, and why
git-resolve-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 2d 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 — 74 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Resolve Conflicts
Use this as a safety protocol for risky Git conflict resolution. Do not use it as a general guide to interpreting code conflicts.
Required Protocol
-
Collect Git state with the bundled read-only script. Treat it as the deterministic source for conflict-state collection.
<python> <skill-dir>/scripts/git_conflict_preflight.py --repo . -
Stop if unrelated dirty worktree files, staged changes, or untracked files make conflict resolution ambiguous. Ask before stashing, committing, discarding, or moving them.
-
Confirm the remote base by fetching and resolving the fetched ref:
git fetch --prune <remote> git rev-parse --verify <remote>/<base> <python> <skill-dir>/scripts/git_conflict_preflight.py --repo . --base-ref <remote>/<base> -
Before starting a new merge or rebase attempt, create a backup ref:
git branch backup/conflict-resolution/<branch-name> HEAD -
If a Git operation is already in progress, continue that operation. Otherwise use the user-requested operation; when unspecified, prefer rebasing onto the fetched remote base:
git rebase <remote>/<base> -
When conflicts occur, rerun preflight before editing. Use standard Git inspection commands only as needed for path-level detail.
-
Before asking about or resolving any non-mechanical conflict, read
references/interview-gate.md. -
Treat semantic, product, API, data, security, ownership, and deletion-retention conflicts as mandatory stop conditions. Interview the user before resolving them.
-
After each resolution batch, stage resolved files and continue the active operation:
git add <paths> git rebase --continue git merge --continue git cherry-pick --continue -
After completion, verify with preflight, Git checks, and identifiable project checks:
<python> <skill-dir>/scripts/git_conflict_preflight.py --repo . --base-ref <remote>/<base>
git status --short --branch
git diff --check
What ships with it
3 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
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.
- 2d ago First seen · 74 lines · 75 tokens per session scan A 6e1ad8b69ee7
git-resolve-conflicts is a skill published in the GitHub repository hon454/grimoire (2 stars, last pushed 14d ago), licensed MIT. It adds 75 tokens to every session and 690 once invoked, about $0.0004 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
flutter-ui
Build Flutter UI from Figma MCP or image input. Scans src for design tokens (colors, sizes, text styles), existing components, and naming conventions before writing a single line of code. Never hard-codes values.
review
Plan-aware graph-enhanced code review before merge. CRITICAL issues block merge. Use after fix/verify.
serena
Serena code intelligence — LSP-powered symbol navigation, diagnostics, and targeted code surgery. Activate before complex refactors, cross-file analysis, or when graph tools need symbol-level depth.
database-migrations
Database migration best practices for schema changes, data migrations, rollbacks, and zero-downtime deployments across PostgreSQL, MySQL, and common ORMs (Prisma, Drizzle, Kysely, Django, TypeORM, golang-migrate).
diagnose
Structured 6-phase debugging. Build feedback loop first, reproduce deterministically, hypothesize with ranked falsifiable theories, instrument one variable at a time, fix with regression test, cleanup. Use when a bug exists, tests fail unexpectedly, or behavior is wrong and cause is unknown.
execute
Dispatch and execute implementation plans with TDD and checkpoints. Use when plan is ready. Parallel by default for independent tasks.