Borrowing it
Nothing to install: this file belongs to tbhb/vale-ai-tells. 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/tbhb/vale-ai-tells/main/.claude/skills/codex-resolve-rebase-conflicts/SKILL.mdgit clone --depth 1 https://github.com/tbhb/vale-ai-tellsWrote 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/tbhb/vale-ai-tells/codex-resolve-rebase-conflicts)<a href="https://agentmods.dev/skills/tbhb/vale-ai-tells/codex-resolve-rebase-conflicts"><img src="https://agentmods.dev/badge/skills/tbhb/vale-ai-tells/codex-resolve-rebase-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/tbhb/vale-ai-tells/codex-resolve-rebase-conflicts"><img src="https://agentmods.dev/badge/skills/tbhb/vale-ai-tells/codex-resolve-rebase-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 2 findings, up to medium
These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →
- medium Excessive Agency · line 4 Skill enables autonomous high-impact decisions without human-in-the-loop verification. Critical operations (destructive commands, financial transactions, data deletion) should require explicit user confirmation.Fix: Add human-in-the-loop confirmation for destructive, irreversible, or high-impact operations. Never auto-execute commands that modify files, send data, or alter system state.
- medium Excessive Agency · line 68 Skill enables autonomous high-impact decisions without human-in-the-loop verification. Critical operations (destructive commands, financial transactions, data deletion) should require explicit user confirmation.Fix: Add human-in-the-loop confirmation for destructive, irreversible, or high-impact operations. Never auto-execute commands that modify files, send data, or alter system state.
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.00121 | $0.01921 |
| Opus 5 | $0.00060 | $0.00960 |
| Sonnet 5 | $0.00024 | $0.00384 |
| Haiku 4.5 | $0.00012 | $0.00192 |
Grade A, and why
codex-resolve-rebase-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 12d 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 — 140 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve rebase conflicts
Settle every conflicted path and stage it, so the rebase can advance. This skill ends there. Continuing the replay and verifying the result belong to the codex-rebase skill.
Codex doesn't provide a skill-scoped command hook. Never use --ours or --theirs. The scripts use unambiguous side names. Stage only named paths after checking them for markers, and return through the continuation script, which checks the staged blobs again.
The inversion, once
During a rebase git checks out the base and replays your commits onto it. Your work is the side arriving, so git calls it --theirs, and the base you are moving onto becomes --ours. Every intuition about which word means which runs backwards here, and a wrong pick resolves cleanly and stays wrong.
Nothing in this skill uses either word. The sides are:
base-sideis the commit the branch replays onto. git calls it--ours, and the index calls it stage 2.replayed-sideis the commit git is replaying right now. git calls it--theirs, and the index calls it stage 3.
The scripts read the index stages rather than the marker labels, so the naming holds under whatever marker style the repository sets.
Marker shape
With merge.conflictStyle set to diff3 or zdiff3, a conflict has three sections rather than two:
<<<<<<< HEAD
the base-side content
||||||| <ancestor label>
what both sides started from
=======
the replayed-side content
>>>>>>> <commit> (<subject>)
That ||||||| section is the common ancestor, and it's the most useful part of the block: it says what each side changed rather than only what each side now holds. The default merge style omits it. Handle both, and never assume the two-way form.
A bare ======= line isn't a marker on its own. It underlines a setext heading in ordinary Markdown, so the scripts here match only <<<<<<<, |||||||, and >>>>>>>.
Step 0: open the task list
Create these with update_plan, keeping exactly one item in_progress at a time.
What ships with it
5 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.
- 12d ago First seen · 140 lines · 121 tokens per session scan A 7056ff9d353c
codex-resolve-rebase-conflicts is a skill published in the GitHub repository tbhb/vale-ai-tells (93 stars, last pushed 2d ago), licensed MIT. It adds 121 tokens to every session and 1,921 once invoked, about $0.0006 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-30.
Other skills, from other repositories
anti-slop
Remove AI slop from any voice-bearing prose — original posts, threads, articles, long-form, emails, docs, READMEs, marketing copy, bios, scripts. Use when drafting text meant to sound like a specific person or brand, when rewriting text that reads generic, corporate, or AI-generated, or when asked to humanize…
kill-slop
Audit a file or draft for AI slop and off-voice lines against the author's bound voice, report findings with in-voice swaps, then apply approved fixes. Use when the user says "kill slop", "/kill-slop [file]", "find the slop in this", "audit this for slop", or wants a deck, article, page, or draft cleaned to sound like…
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
humanizer
Humanize and de-slop AI-sounding prose while preserving meaning, specific detail, and genuine human quirks. When a voice sample or style profile is available, rewrite in that writer's actual voice. Remove recurring AI tells such as inflated significance, stock vocabulary, uniform rhythm, excessive hedging, formulaic…
authenticity-check
Score how authentically text reads as a real human author's work, flag spans that read as AI-generated, AI-templated, or generically derivative, and run a separate read-only scan for suspicious Unicode provenance carriers. Return an authenticity band, a 0-100 score, provenance signals, and span-level reasons. Use when…
ai-slop-detector
Universal prose audit. Scores writing on TWO axes — AI-Slop (does this read like AI wrote it?) and Comprehension (can a fresh reader follow this?). Use PROACTIVELY as a mandatory final QA pass on ANY prose generated for humans to read — every email (internal or external), proposal, report, status update, blog post…