Menu
Use when you need to resolve an in-progress git merge/rebase conflict. Guides systematic resolution preserving both intents where possible.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation. Contains the reusable grilling loop and domain-modeling discipline.
Execute spec-driven implementation using Generator/Evaluator dual-agent loop with BDD+TDD double-loop verification. Use when implementing features from a design spec, running tasks from tasks.md, or building code with structured testing.
Generate a complete feature design specification (design.md, tasks.md) and Gherkin scenarios from natural language requirements. Use when planning, designing, or scoping new features, refactors, or bug fixes for AI-driven implementation.
Build a throwaway prototype to answer a design question — a terminal app for state/logic questions, or several UI variations toggleable from one route. Use when the user wants to sanity-check whether a state model feels right, or explore what a UI should look like.
Two-axis review of the diff since a fixed point — Standards (does the code follow this repo's coding standards?) and Spec (does the code match what the originating issue/PRD asked for?). Runs both reviews in parallel subagents. Use when completing tasks, implementing major features, or before merging.
Systematic debugging methodology for finding root causes before attempting fixes. Includes feedback-loop construction, minimization, and hypothesis-driven diagnosis. Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.
| name | pb-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict. Guides systematic resolution preserving both intents where possible. |
Resolve merge/rebase conflicts systematically. Always resolve; never --abort.
Check git history, and the conflicting files:
git status
git log --oneline -5
Identify whether this is a merge or a rebase, and which files have conflicts.
For each conflicting file, understand deeply why each change was made:
For each conflict marker (<<<<<<<, =======, >>>>>>>):
--abortDiscover the project's automated checks and run them — typically typecheck, then tests, then format:
uv run ruff check
uv run ty check
uv run pytest
Fix anything the merge broke.
Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased:
git add -A
git commit # or git rebase --continue
git merge --abort or git rebase --abort without trying to resolve