resolve-conflicts

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 first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

$ 설치

git clone https://github.com/manthanabc/paws /tmp/paws && cp -r /tmp/paws/.paws/skills/resolve-conflicts ~/.claude/skills/paws

// tip: Run this command in your terminal to install the skill