Home / Skills / roo-conflict-resolution
roo-conflict-resolution
zgsm-ai/costrictSkill
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.
Why this score
This repo hosts 3 skills, so its 4,451 stars are split between them (about 1,484 each) for scoring.
Popularity score: 75/100 from public GitHub signals only. It shows how widely used and maintained this is, not how well it works. Not included yet: the fake-star check. The security scan is shown separately and doesn't change the score. How we rank
Security
Scanned Oct 20, 2026 at commit dd38f540d3c3, with Cisco's open-source skill-scanner.
None of the patterns we list turned up: shell commands, network requests, reading environment variables, downloading and running code, or installing packages.
A scan lists patterns in the code. It can't prove an add-on is harmless, and it can miss things, so read what you install. How we scan
Alternatives
Other makers' add-ons that do the same job, next to this one.
| Name | Score | Stars | Context | Updated |
|---|---|---|---|---|
| This oneroo-conflict-resolution zgsm-ai/costrict · Skill | 75 | ★ 4.5k | ≈84 always | 1mo ago |
| agent-merge-conflict-arbiter NousResearch/hermes-agent · Skill Both about conflict and merge | 96 | ★ 255k | ≈21 always | 16d ago |
| resolve-conflicts tailcallhq/forgecode · Skill Both about conflict and merge | 79 | ★ 7.6k | ≈96 always | 16d ago |
| issue-root-resolution Gentleman-Programming/gentle-ai · Skill Both about resolution | 78 | ★ 7.9k | ≈57 always | 16d ago |
| 3d-retina-resolution MengTo/Skills · Skill Both about resolution | 78 | ★ 6.8k | ≈82 always | 17d ago |
| sw-character-conflict jtydhr88/screenwriting-skills · Skill Both about conflict | 67 | ★ 1.7k | ≈156 always | 1mo ago |