Skip to content
中文

Leaderboard / Coding

roo-conflict-resolution

roo-conflict-resolution (RooCodeInc/Roo-Code): 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.

Stars
24k
Votes
—
Score
43.8451

Source: RooCodeInc/Roo-Code · .roo/skills/roo-conflict-resolution/SKILL.md

Open ↗
npx skills add RooCodeInc/Roo-Code --skill roo-conflict-resolution

Rate this skill

Related skills

01 brainstormingobra/superpowers Coding 318k
5502.1
↗
02 app-e2e-testsanomalyco/opencode Coding 227k
5356.1
↗
03 component-testsanomalyco/opencode Coding 227k
5356.1
↗
04 karpathy-guidelinesmultica-ai/andrej-karpathy-skills Coding 218k
5337.5
↗
05 ponytailDietrichGebert/ponytail Coding 191k
5280.6
↗