git-workflowsdevops
git-conflict
Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.
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