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
Обновлено 1/19/2026
Звёзды
8
Форки
0
quick start

Installation and usage

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

Установка
$ install --globalskills.sh
Использование

После установки вы можете использовать этот skill, выполнив следующую команду в терминале:

skills use git-conflict