resolve-conflicts

What problem does it solve?

Git merge conflicts stall development by forcing teams to manually reconcile imports, tests, and configuration across branches. This skill provides a structured, plan-first framework that captures intent from both sides and guides users through a repeatable conflict-resolution process.

Core Features & Use Cases

• Assess and categorize conflicts (regular, deleted-modified, generated, test, import, config, and struct changes) to inform a consistent plan.
• Create a Merge Resolution Plan with a clear Conflict Summary, Execution Order, and decision points, then require user approval before applying changes.
• Handle deleted-modified conflicts by backing up modifications, suggesting relocation targets, and preserving user work.
• Execute the resolution plan step-by-step, providing one-line explanations for each resolved conflict and surfacing user decisions when ambiguity remains.
• Regenerate generated files (lock files, codegen artifacts) instead of manual merges, ensuring the merged state reflects source-of-truth changes.
• Merge imports and tests using additive, non-destructive patterns; resolve configuration and code-logic conflicts with documented decisions.
• Validate outcomes with automated checks and provide a concise plan for follow-up verification.
• Maintain traceability by documenting resolutions and decisions for auditability.

Quick Start

Generate a structured conflict-resolution plan for the current merge and request user approval before applying changes.