skills.homes logoskills.homescapability registry
home/categories/git-workflows/zgsm-ai-costrict-roo-skills-roo-conflict-resolution-skill-md
cd ..
git-workflowsdevops

roo-conflict-resolution

Provides comprehensive guidelines for resolving merge conflicts intelligently using git history and commit context. Use when tasks involve merge conflicts, rebasing, PR conflicts, or git conflict resolution. This skill analyzes commit messages, git blame, and code intent to make intelligent resolution decisions.

View Sourcegit-workflows
zgsm-ai
maintainer
zgsm-ai
Updated 3/5/2026
Stars
3895
Forks
151
quick start

Installation and usage

Provides comprehensive guidelines for resolving merge conflicts intelligently using git history and commit context. Use when tasks involve merge conflicts, rebasing, PR conflicts, or git conflict resolution. This skill analyzes commit messages, git blame, and code intent to make intelligent resolution decisions.

Installation
$ install --globalskills.sh
Usage

Once installed, you can use this skill by running the following command in your terminal:

skills use roo-conflict-resolution