メニュー
Use when you need to resolve an in-progress git merge/rebase conflict.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| description | Use when you need to resolve an in-progress git merge/rebase conflict. |
| metadata | {"github-path":"skills/engineering/resolving-merge-conflicts","github-ref":"refs/tags/v1.0.1","github-repo":"https://github.com/mattpocock/skills","github-tree-sha":"b601c90446f887a94ec68e5c2301a8919f949a2c"} |
| name | resolving-merge-conflicts |
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.
Drive and read Ionwake's `__ionwake*` window instrumentation hooks (`__ionwakeScene` on /play, `__ionwakeShipyard` on /shipyard, and the dev-only `__ionwake` debug flags) from outside the page via the Chrome DevTools MCP. Use to read live sim/scene/clock state, screenshot the running app, drive the shipyard, load ship models, inspect a ship schema, log the WebTransport wire, or keep a backgrounded tab stepping.
Compact the current conversation into a handoff document for another agent to pick up.
Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.
Ask which skill or flow fits your situation. A router over the user-invoked skills in this repo.
Interview the user relentlessly about a game design concept or design until reaching shared understanding, stress-testing the concept and resolving each branch of the decision tree.
A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go.
