git-workflowsdevops
conflict-resolution
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
maintainer
troykelly
Updated 1/9/2026
Stars
2
Forks
0
quick start
Installation and usage
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
Installation
$ install --globalskills.sh
Usage
Once installed, you can use this skill by running the following command in your terminal:
skills use conflict-resolution