Resolve Conflict

Description

You are resolving git merge/rebase conflicts. Follow this procedure, and **briefly tell the user what you're doing and what you found at each step** before moving to the next. ## Steps 1. **Identify conflicted files**: Run `git diff --name-only --diff-filter=U` to list all files with conflicts. Tell the user how many files are conflicted and which areas of the codebase they touch (e.g. "12 files — mostly routes and services, plus one migration"). 2. **Understand the conflict pattern**: Sample

Installation

Installs to ~/.claude/skills/jnelken-ai-tools-resolve-conflict/SKILL.md

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