Skill · Adapted · v1.1.2

Resolve Merge Conflicts

Resolve merge, rebase or cherry-pick conflicts by reconstructing both sides' intent, then check the result.

Install

Your agent

clio-kit skill install clio-kit-resolve-merge-conflicts --target .agents/skills

Installs the procedure and its resources. Configure required MCP servers separately. Other host tools may need their own setup.