resolve-conflicts

Features and purpose

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.

Quick start

Follow the repository instructions for this skill and your agent. Review the files and dependencies before adding it to your workflow.