resolve-merge-conflicts
resolve-merge-conflicts is a Branching, merging & history skill for AI agents, published by warpdotdev in the common-skills repository on GitHub. Skillspace rates resolve-merge-conflicts D (68/100) and it passed the safety scan; the rating is based on static analysis only.
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
- Grade
- D
- Quality
- 68 / 100
- Safety
- Passed
- GitHub stars
- 577
Unproven: rated by static analysis only, not yet compared head-to-head.
This rating describes the version of the repository we crawled; it may have changed since, so go by its current files.
Our review
- Architecture
- 100 / 100
- Maturity
- Basic: a single SKILL.md
- Security scan
- No issues found
- License
- Not declared. Check the repository before reusing it.
Not checked yet
- Category is a classifier prediction; no model has read this skill yet
- Not judged on the rubric yet (not a contender in its category)
- No blind task eval yet
- Scope (portable / vendor / repo-internal) not assessed; only the top of each category is read for scope
- Sibling files (scripts, references) not fetched; security scan covers SKILL.md only
Skillspace indexes and rates this skill; it does not host or endorse it. Run third-party skills at your own risk.