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
Mis à jour 1/19/2026
Étoiles
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
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-conflict-resolution