Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
Inherits all available tools
Additional assets for this skill
This skill inherits all available tools. When active, it can use any tool Claude has access to.