git-workflowsdevops
conflict-resolution
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
maintainer
troykelly
更新于 1/13/2026
星标
5
分支
0
quick start
Installation and usage
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
安装
$ install --globalskills.sh
使用
安装后，您可以通过在终端运行以下命令来使用此技能：
skills use conflict-resolution