Menü
Use when you need to resolve an in-progress git merge/rebase conflict.
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
| name | resolving-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict. |
Read the current state of the merge or rebase. Inspect the git history and the files that conflict.
Trace each conflict back to its source. Understand fully why each side made its change and what it was trying to achieve — read the commit messages, look at the PRs, follow the originating issues/tickets.
Resolve every hunk. Keep both intents wherever they can coexist. Where they can't, take the side that matches the merge's stated goal and record the trade-off. Do not invent new behaviour. Always resolve; never --abort.
Find the project's automated checks and run them — usually typecheck first, then tests, then format. Repair whatever the merge broke.
Complete the merge/rebase. Stage everything and commit. If you're rebasing, keep continuing until every commit is replayed.
Recurring maintenance pass over automated dependency-bump PRs (Dependabot, Renovate, or similar) — rebase, relock, verify, and report what's ready to merge. Meant to be handed to a time-based loop or schedule, not run once.
Post-deploy verification loop — poll a rollout until every instance is on the new version and healthy, then run one smoke check against a real user path. Meant to be handed to a time-based loop with a timeout, not polled by hand.
Reference for designing agent loops — cycles of work that repeat until a stop condition is met. Covers the four loop shapes, writing completion criteria, carrying state and isolating work across cycles, and what running unattended still leaves on you.
Recurring check-in on a stack of dependent PRs — rebase children onto updated parents, surface CI state, flag anything waiting on a human-only gate, and report only what changed since last time. Meant to be handed to a time-based loop, not run once.
Pick the skill or flow that fits your situation. A router over the skills in this repo.
Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/PRD asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to "review since X".
