resolve-conflicts

Provides a structured, plan-based approach to resolving merge conflicts with user approval and backup handling.

• Resolves merge conflicts through a step-by-step plan before execution
• Handles deleted-modified files with backups and analysis
• Regenerates generated files (e.g., lock files, tests) from source
• Prioritizes preserving both changes where possible

• Plan before executing: create and get user approval on resolution strategy
• Prefer both changes unless they contradict directly
• Merge, don't choose: especially for imports, tests, configuration
• Regenerate generated files instead of manually merging
• Backup before resolving deleted-modified files
• Validate with tests after resolution
• Explain every resolution with one-line strategy
• Ask user when resolution is unclear

1. 1.Run when user mentions merge conflicts needing resolution
2. 2.Assess conflict situation with `git status` and categorize files
3. 3.Create and present a detailed merge resolution plan for user approval
4. 4.After approval, handle deleted-modified files with backups
5. 5.Execute resolution in defined order: backups → generated files → regular merges
6. 6.For unclear cases, present options and ask user to choose