home/categories/git-workflows/troykelly-claude-skills-skills-conflict-resolution-skill-md
git-workflowsdevops

conflict-resolution

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

troykelly
maintainer
troykelly
Atualizado 1/13/2026
Estrelas
5
Forks
0
quick start

Installation and usage

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

Instalação
$ install --globalskills.sh
Uso

Depois de instalar, você pode usar esta skill executando o seguinte comando no terminal:

skills use conflict-resolution