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
使い方

インストール後、ターミナルで以下のコマンドを実行してこのスキルを使用できます:

skills use git-conflict