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