Skill
merge-resolver
Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).
Bundled with ai-agents. Its trust score, security findings and other files are on the plugin page.
SKILL.md
- Path
- skills/merge-resolver/SKILL.md
- Size
- 18 KB
- SHA-256
- a7c4df84a500038c7bd03c73fb7f439f7d57cef6eddbe565cfc693c31bad8c4e
Install
Install the plugin's skills with the Skills CLI:
npx [email protected] add rjmurillo/ai-agents