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