home/categories/git-workflows/troykelly-codex-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
Actualizado 1/9/2026
Estrellas
2
Forks
0
quick start

Installation and usage

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

Instalación
$ install --globalskills.sh
Uso

Después de instalarlo, puedes usar este skill ejecutando el siguiente comando en tu terminal:

skills use conflict-resolution