home/categories/git-workflows/ssiumha-dots-prompts-skills-git-conflict-skill-md
git-workflowsdevops

git-conflict

Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.

ssiumha
maintainer
ssiumha
Mis à jour 1/19/2026
Étoiles
8
Forks
0
quick start

Installation and usage

Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.

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 git-conflict