git-workflowsdevops
merge-conflict-resolution
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
maintainer
axiomantic
Actualizado 1/19/2026
Estrellas
2
Forks
0
quick start
Installation and usage
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
Instalación
$ install --globalskills.sh
Uso
Después de instalarlo, puedes usar este skill ejecutando el siguiente comando en tu terminal:
skills use merge-conflict-resolution