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