merge-resolver
merge-resolver is a Branching, merging & history skill for AI agents, published by rjmurillo in the ai-agents repository on GitHub. Skillspace rates merge-resolver A (94/100) and it passed the safety scan; the rating is based on static analysis only.
Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).
- Grade
- A
- Quality
- 94 / 100
- Safety
- Passed
- GitHub stars
- 38
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
- Packaged: licensed, with a version or references
- Security scan
- No issues found
- License
- MIT
- Adoption
- Adopted by 0 other repositories, in 0 collections
Not checked 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.