home/categories/automation-tools/rjmurillo-ai-agents-claude-skills-merge-resolver-skill-md
automation-toolstools

merge-resolver

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.

rjmurillo
maintainer
rjmurillo
更新於 1/20/2026
星標
5
分支
0
quick start

Installation and usage

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 --globalskills.sh
使用

安裝後,您可以透過在終端機執行以下指令來使用此技能:

skills use merge-resolver