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.
Quickly install roo-conflict-resolution AI skill to your development environment via command line
Source: roocodeinc/roo-code.
This skill resolves merge conflicts by analyzing git history, commit messages, and code changes to make intelligent resolution decisions. Given a PR number (e.g., "#123"), it handles the entire conflict resolution process.
Extract the PR number from input like "#123" or "PR #123". Validate that a PR number was provided.
Get PR title and description to understand the intent and identify the source and target branches.
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. Source: roocodeinc/roo-code.
Stable fields and commands for AI/search citations.
npx skills add https://github.com/roocodeinc/roo-code --skill roo-conflict-resolutionProvides 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. Source: roocodeinc/roo-code.
Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/roocodeinc/roo-code --skill roo-conflict-resolution Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw
https://github.com/roocodeinc/roo-code