What problem does it solve? Resolving merge conflicts during a rebase or merge is error-prone: picking the wrong side, discarding unrelated changes with whole-file checkouts, or continuing with leftover conflict markers can silently corrupt a branch. This Skill provides a disciplined, safe workflow for resolving conflicts from an operation that is already in progress. ## Core Features & Use Cases - Intent-diff resolution: Classifies each conflict against five safe categories (complementary, identical, formatting, rename/API-migration, strict-superset) using the incoming side's actual diff rather than raw conflict markers. - Verification gate: Runs the project's narrowest authoritative validation before continuing, and escalates with a structured payload when a conflict falls outside the safe set. - Driver contract: Acts as the per-conflict engine for driver skills such as code-gt-restack-resolve, with overridable continue command, bail-out conditions, and escalation channel. - Use Case: During a git rebase that stops on three conflicted files, the Skill classifies each conflict, edits only the conflict regions, runs the project checks, and continues the rebase to completion. ## Quick Start Ask the agent to resolve the conflicts in my current in-progress rebase and continue it safely to completion.
