Home / Skills / concurrent-branches
concurrent-branches
Resolve conflicts and merges when several branches are open against one repo at the same time — the hotspot files every change must touch (registry manifests, a single version field, shared tool config, one aggregated test module, tracked build output), union-vs-recompute-vs-rebuild as three different correct resolutions, generated artifacts that must never be merged, non-deterministic serialization that makes every branch conflict, renumbered identifiers that git cannot show you, and why a clean auto-merge is not a passing test. Use when rebasing or merging a long-lived branch, resolving conf
Why this score
This repo hosts 10 skills, so its 2,017 stars are split between them (about 202 each) for scoring.
Popularity score: 71/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 11a70aa680c0, 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 oneconcurrent-branches kajisho5/ffmpeg-skill · Skill | 71 | ★ 2.0k | ≈155 always | 18d ago |
| hydrogen-branches Shopify/hydrogen · Skill Both about branche and branch | 73 | ★ 2.1k | ≈26 always | 16d ago |
| branche naiersaidane/claude-mastery · Skill Both about branche and version | 49 | ★ 61 | ≈109 always | 4mo ago |
| neon-postgres-branches jaakla/openmapstack-skills · Skill Both about branche and branch | 58 | ★ 75 | ≈24 always | 16d ago |