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.

Install

KitScout test notes

Not tested by KitScout yet. When our harness runs it, pros, cons and the tasks we tried appear here, with the date and evidence.

Similar tools

• rea-changelog-update 456,653 ★
  Prepare or rewrite REA release changelogs and GitHub release notes from pinned Git history, with verified cont
• git-guardrails-claude-code 323,485 ★
  Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before t
• pr 323,485 ★
  Use when writing a PR body.
• setup-matt-pocock-skills 323,485 ★
  Configure this repo for the engineering skills: set up its issue tracker, triage label vocabulary, and domain
• setup-pre-commit 323,485 ★
  Set up Husky pre-commit hooks with lint-staged (Prettier), type checking, and tests in the current repo. Use w