resolve-conflicts

To resolve Git merge conflicts safely, this tool guides you through a plan-first process that assesses conflicts, generates a detailed resolution plan, and requires your approval before applying any changes.

Handling Git merge conflicts in lock files and configuration requires a structured resolution plan with backups and analysis. This skill supports these common conflict types to preserve intent and minimize disruption.

Creating a backup before resolving a deleted-modified Git merge conflict is built into this tool's execution phase, ensuring you can safely analyze and step through the resolution process.

Yes, you can review a Git merge resolution plan before changes are applied. The tool enforces user approval at each step, generating a final validation plan to ensure the merge is correct.

To resolve import and test conflicts during a Git merge, the tool applies a structured step-by-step action plan with on-demand scaffolding and references to standardize the merge safely.

A structured plan for Git merge conflict resolution prevents accidental data loss by enforcing user approval, creating backups, and validating the final merge state to preserve original intent.