merge-conflicts
merge-conflicts is a Branching, merging & history skill for AI agents, published by bikeindex in the bike_index repository on GitHub. Skillspace rates merge-conflicts D (59/100) and it passed the safety scan; the rating is based on static analysis only.
How to bring a branch up to date and resolve git merge conflicts the way this repo expects — merge (never rebase or force-push), understand each side's intent before choosing, ask when a resolution isn't clear-cut, and keep the merge commit to just the merge. Trigger whenever you're about to run `git merge`/`git pull`, sync a branch with `main`, "update from main", or resolve conflict markers left by a merge, cherry-pick, or interrupted pull — including bare phrasings like "fix the conflicts", "merge main in", or "this branch is behind". Not for merging data/files (PDFs, CSVs) or algorithms (merge sort) — this is strictly about git branch integration.
- Grade
- D
- Quality
- 59 / 100
- Safety
- Passed
- GitHub stars
- 308
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
- 84 / 100
- Maturity
- Basic: a single SKILL.md
- Security scan
- No issues found
- License
- AGPL-3.0
- Adoption
- Adopted by 0 other repositories, in 0 collections
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.