Resolving-Conflict

What problem does it solves? Git conflicts during rebase or merge operations can be daunting and time-consuming, often leading to frustration and errors. This Skill provides a systematic, guided process to identify, analyze, and resolve conflicts, ensuring clean code integration and letting you focus on development, not debugging merge issues.

Core Features & Use Cases

• Conflict Detection: Automatically identifies if you're in a rebase or merge conflict state and lists all conflicting files.
• Guided Resolution: Presents conflicting file contents clearly and offers structured options for resolution (ours, theirs, manual integration).
• Workflow Completion: Guides you through git add and git rebase --continue or git commit to finalize the process.
• Use Case: You've just pulled changes and hit a merge conflict. Activate this Skill to have Claude walk you through each conflicting file, showing you the differences and helping you choose the correct resolution, then completing the merge for you.

Quick Start

User: I'm stuck in a Git merge conflict. Can you help me resolve it? Agent: Yes, I can use the Resolving-Conflict skill. First, I'll check your current Git status to understand the conflict. Then, I'll list the conflicting files for you.