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