home/categories/git-workflows/troykelly-codex-skills-skills-conflict-resolution-skill-md
git-workflowsdevops

conflict-resolution

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

troykelly
maintainer
troykelly
更新於 1/9/2026
星標
2
分支
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