resolve-conflicts

Merge conflicts occur when Git cannot automatically combine changes from two branches. This Skill creates a structured resolution plan that assesses all conflicts—imports, tests, lock files, deleted-modified cases—applies appropriate merge strategies (prefer both changes, regenerate locks, backup originals), and validates the result with tests to preserve intent across regular, generated, and binary files.

Yes. This Skill distinguishes between generated artifacts, lock files, imports, tests, and code conflicts. For generated files it regenerates from source; for lock files it applies merge strategies with backups. Each phase—deleted-modified, generated, imports, tests, code—follows separate rules and relocation analysis to ensure consistency.

A plan-first approach structures the resolution: assess all conflict types upfront, generate an explicit plan with decision prompts, obtain your approval before execution, then apply targeted strategies (merge imports intelligently, preserve test coverage, validate with test runs). This avoids ad-hoc merges and ensures decisions are traceable.

Deleted-modified conflicts are handled as a distinct phase in the resolution plan. The Skill analyzes whether the deletion or modification better serves the merge intent, applies the chosen strategy with backup, and validates the outcome so you can make an informed decision before committing.

Yes. The Skill's scope includes configuration files, regenerated artifacts, and binary files. It applies appropriate merge strategies for each type—backups ensure originals are preserved—and provides traceable explanations so you understand how each conflict was resolved.

The Skill presents the plan for explicit approval before execution. If the proposed resolution doesn't align with your intent, you can reject it, modify decisions at clear prompts, and guide a new resolution that matches your requirements before any changes are applied.