Logo
Agent Skills Guide

merge-resolver

published 2026/01/27

Resolve merge conflicts by analyzing git history and commit intent. Use when PR has conflicts with base branch, can't merge due to conflicts, or need to fix merge conflicts systematically with session protocol validation.

📦 Install Skill

Command line install

Install directly with the `skills` CLI.

npx skills add rjmurillo/ai-agents/.claude/skills/merge-resolver

Local download

Download only this skill directory.

Download merge-resolver only
File Explorer
0 files
No file selected
readonly

Select a file to view its content