Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill…
Git Conflict Resolution Resolve Git merge conflicts by intelligently combining changes from both branches while preserving the intent of both changes. This skill follows a plan-first approach: assess conflicts, create a detailed resolution plan, get approval, then execute. Core Principles Plan Before Executing: Always create a structured resolution plan and get user approval before making changes Prefer Both Changes: Default to keeping both changes unless they directly contradict Merge, Don't Choose: Especially for imports, tests, and configuration Regenerate Generated Files: Never manually merge generated files - always regenerate them from their sources Backup Before Resolving: For deleted-modified files, create backups first Validate with Tests: Always run tests after resolution Explain All Resolutions: For each conflict resolved, provide a one-line explanation of the resolution strategy Ask When Unclear: When the correct resolution isn't clear from the diff, present options to the user and ask for their choice Workflow Step 1: Assess the Conflict Situation
don't have the plugin yet? install it then click "run inline in claude" again.