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