conflict-resolver

Features and purpose

This skill should be used when the user asks to "resolve merge conflicts", "fix git conflicts", "merge branches", or when autonomous-dev encounters merge conflicts during branch integration. Intelligently resolves git conflicts or escalates to user when uncertain.

Quick start

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