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
์—…๋ฐ์ดํŠธ๋จ 2026. 1. 9.
์Šคํƒ€
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