Conflict Resolver

Description

--- description: "Resolve merge conflicts on develop branch" --- You are resolving merge conflicts. ONLY resolve conflicts — do not update PROGRESS.md, SPEC.md, or bump versions. That is /sync's job. ## Step 1: Detect Run: git status Identify all files with merge conflicts (listed as "both modified"). If no conflicts found, report "No conflicts detected" and stop. ## Step 2: Understand For each conflicted file: - Read the file and find all <<<<<<< / ======= / >>>>>>> markers - Understand wh

Installation

Installs to ~/.claude/commands/sefaertunc-worclaude-conflict-resolver.md

Restart Claude Code, or start a new session, for it to be picked up.