concurrent-branches SKILL.md skillA
concurrent-branches from kajisho5/ffmpeg-skill is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add kajisho5/ffmpeg-skill/concurrent-branches@git:20260906.24c1610Pins git:20260906.24c1610 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- kajisho5/ffmpeg-skill
- Path
.claude/skills/concurrent-branches/SKILL.md- Versions recorded
- 1
- Latest version
- git:20260906.24c1610, committed Sep 6, 2026
- Size
- 11,268 bytes
- Repository stars
- 2,026
- License
- MIT
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…
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# Merging Concurrent Branches When several branches are open against the same repo at once, the conflicts do not land in the code you were thinking about. They land in a small, predictable set of **hotspot** files that nearly every change has to touch — a registry manifest, a version field, shared tool config, one aggregated test module, a tracked build output. Each hotspot has exactly one correct resolution, and they are not the same rule. "Take ours" / "take theirs" is right for almost none of them. Worse, getting one wrong is silent: the dropped entry, the collided version, the stale bundle all merge green and are found later by someone who cannot reproduce them. ## Find the hotspots before you need to resolve them Files touched by nearly every commit are the files your branch will conflict on. ```bash # the 15 files most commits touch — your hotspot list git log --format= --name-only -n 200 | sort | uniq -c | sort -rn | head -15 ``` Write the resolution rule for each one into the contributing docs. Under conflict pressure, with a stale branch and a red CI run, nobody re-derives "the version field is recomputed, not merged" correctly. …
Read the whole file at its exact version.
How to install
mdr add kajisho5/ffmpeg-skill/concurrent-branches@sha256:07b9d877010b56a9The line at the top of this page pins the label git:20260906.24c1610, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_ojwkmeyb5igpq33q)
5 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Sep 6, 2026.
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (11268 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
kajisho5/ffmpeg-skill · 2,026 stars · license MIT · pushed 2026-10-20 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_ojwkmeyb5igpq33q GET https://markdownregistry.com/api/v1/resolve?ref=kajisho5/ffmpeg-skill/concurrent-branches GET https://markdownregistry.com/api/v1/blob/07b9d877010b56a92079e581146ab516f88a9d5a4f50ee74bc5de95b4e39a6b2
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.