What problem does it solve? Resolving git merge conflicts requires understanding the intent of both conflicting sides, and manual resolution is error-prone when two branches modify the same region. This Skill analyzes both sides' intent, proposes a unified resolution as a diff, and gates any change behind operator confirmation so nothing touches the working tree without approval. ## Core Features & Use Cases - Semantic conflict analysis: Parses conflict markers, gathers commit context from both branches, and dispatches a cross-check review that returns a COMPATIBLE, INCOMPATIBLE, or NEEDS-HUMAN verdict with a proposed unified diff. - Operator-confirm gate with opt-in auto-apply: Auto-apply requires a policy file, high reviewer confidence, forbidden-paths clearance, and required validator gates; sensitive paths like migrations, secrets, and auth files always require manual confirmation. - Post-apply validation: Verifies no conflict markers remain and runs operator-defined gates such as the project test suite. - Use Case: After a git rebase exits with conflict markers in a shared handler file, ask the assistant to resolve the conflict; it analyzes both sides' intent, proposes a diff, and waits for your apply or reject decision. ## Quick Start Ask the assistant to resolve the current git merge conflict by analyzing both branches' intent and proposing a unified resolution for your approval.
