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
Mis à jour 1/20/2026
Étoiles
5
Forks
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.

Installation
$ install --globalskills.sh
Utilisation

Après l'installation, vous pouvez utiliser ce skill en exécutant la commande suivante dans votre terminal :

skills use merge-resolver