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