home/categories/git-workflows/adiomas-claude-code-adiomas-plugins-autonomous-dev-skills-conflict-resolver-skill-md
git-workflowsdevops
conflict-resolver
This skill should be used when the user asks to "resolve merge conflicts", "fix git conflicts", "merge branches", or when autonomous-dev encounters merge conflicts during branch integration. Intelligently resolves git conflicts or escalates to user when uncertain.
maintainer
adiomas
์
๋ฐ์ดํธ๋จ 1/18/2026
์คํ
0
ํฌํฌ
0
quick start
Installation and usage
This skill should be used when the user asks to "resolve merge conflicts", "fix git conflicts", "merge branches", or when autonomous-dev encounters merge conflicts during branch integration. Intelligently resolves git conflicts or escalates to user when uncertain.
์ค์น
$ install --globalskills.sh
์ฌ์ฉ๋ฒ
์ค์น ํ ํฐ๋ฏธ๋์์ ๋ค์ ๋ช ๋ น์ ์คํํ์ฌ ์ด ์คํฌ์ ์ฌ์ฉํ ์ ์์ต๋๋ค:
skills use conflict-resolver