メニュー
Use when you need to resolve an in-progress git merge/rebase conflict.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Ask which skill or flow fits your situation. A router over the user-invoked skills in this repo.
Stages all changes and generates a lean Conventional Commits message via caveman-commit — user reviews and commits manually. Triggers on any commit intent: "commit", "stage my changes", "ready to push", "let's commit", "make a commit", "commit this", "push changes", "squash and commit", or any variation. Use whenever the user signals they're done with changes and ready to commit, even if they don't mention "message" or "caveman". Does NOT run git commit — outputs a ready-to-run command for the user to execute after review.
Autonomous ML research - agent modifies GPT training code, runs 5-min experiments, keeps improvements
Always use browser-harness for any web interaction: automation, scraping, testing, or site/app work.
Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary.
AI spend analytics — see where your token budget goes by task, model, tool, and project across 31 AI coding tools including Claude Code. Use when the user asks about AI costs, token usage, spend breakdown, or wants to optimize their AI budget.
| name | resolving-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict. |
See the current state of the merge/rebase. Check git history, 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, check the PRs, check original issues/tickets.
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.
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
