Skip to content
mcp/skillhub

Agent Skill

Concurrent Branches skill

concurrent-brancheskajisho5/ffmpeg-skill.claude/skills/concurrent-branches/SKILL.md

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 conflict markers, reviewing a merge commit, deciding what a repo should commit vs generate, or setting up a repo that will take parallel contributions.

2.0kMIT

always on

148 tokname + description

once used

2,434 tokSKILL.md body

bundled files

0

repo stars

2.0kGitHub

Install the Concurrent Branches skill

Skills CLI (Claude Code, Codex, Cursor and others)

npx skills add https://github.com/kajisho5/ffmpeg-skill --skill concurrent-branches

Claude Code, by hand (all projects)

git clone --depth 1 https://github.com/kajisho5/ffmpeg-skill.git /tmp/ffmpeg-skill
mkdir -p ~/.claude/skills
cp -R /tmp/ffmpeg-skill/.claude/skills/concurrent-branches ~/.claude/skills/concurrent-branches

For one project only, copy the folder into .claude/skills/ in that project instead. The agent picks it up when a task matches its description.

What it costs your context

Agent Skills load in three steps. Tokens counted with the o200k tokenizer; your model's count will differ a little.

WhenWhat loadsCost
Every sessionName and description148 tok
When the agent uses itThe SKILL.md instructions2,434 tok
Only if openedNo bundled files—

Until it is used, concurrent-branches costs about 9.2× less than the median MCP server we measured (1,363 tokens on every turn). Installing all 14 skills from kajisho5/ffmpeg-skill would load 1,875 tokens of descriptions. Skills vs MCP study

Checks

Our checks found nothing to flag: it follows the Agent Skills specification's naming and size guidelines and doesn't pipe downloads into a shell.

Checked 2026-10-22 · method

What's inside

The headings of its SKILL.md. Read the full file on GitHub.

  • Merging Concurrent Branches
  • Find the hotspots before you need to resolve them
  • Additive registries: union both sides, never choose one
  • Single-value counters: recompute from the integration branch
  • Generated artifacts: rebuild, never merge
  • Non-deterministic serialization turns every branch into a conflict
  • Shared tool config: take the base file, re-apply your delta
  • Aggregated test modules: keep both suites, then check for shadowing
  • Append; never renumber a shared identifier
  • A clean auto-merge is not verification
  • Match the repo's integration style, and re-run the real gate
  • Checklist
  • Note for this repository (ffmpeg-skill)
  • Learn More

More skills from kajisho5/ffmpeg-skill

All skills in this repo
  1. building-python-mcp-serverskajisho5/ffmpeg-skill

    Builds robust Python MCP (Model Context Protocol) servers with FastMCP — tool design, error contracts, event-loop-safe blocking work, subprocess/CLI wrapping, single-file vs packaged distribution, global-state-free testing, and prompt-injection awareness. Use when writing an MCP server, exposing a tool or CLI to an LLM client, debugging tool registration/packaging, or testing MCP tools.

    2.0k86 tok idle · 2,896 in use
  2. ci-pipeline-synthesizerkajisho5/ffmpeg-skill

    Generate GitHub Actions CI/CD pipeline configurations for automated building and testing of library and package projects. Use when creating or updating CI workflows for npm packages, Python packages, Go modules, Rust crates, or other library projects that need automated build and test pipelines. Includes templates for common package ecosystems with best practices for dependency caching, matrix testing, and artifact publishing.

    2.0k79 tok idle · 1,016 in use
  3. ffmpeg-skillkajisho5/ffmpeg-skill

    Edit video and audio with local FFmpeg from natural-language requests: cut, trim, join, resize/reframe (9:16, 1:1), speed change, captions and subtitles (SRT/ASS, animated, karaoke), logos and text overlays, lower-thirds and titles, silence removal, multicam and external-mic sync, loudness normalisation, HDR/Dolby Vision to SDR, LUTs, background music with ducking, platform exports (YouTube, Reels, TikTok, X), compliance checks, scene detection and highlight reels, contact sheets to inspect results, and whole-edit project files. Use this skill whenever the user mentions a video or audio file (mp4, mov, mkv, wav, m4a), footage, a clip, captions, subtitles, a reel or short, YouTube/Instagram/TikTok delivery, LUFS, sync, transcoding, ffmpeg, or asks to make something "60 seconds", "vertical", "louder", "captioned" — even when they do not say "edit". Python 3.9 standard library only, no cloud, no API keys.

    2.0k59238 tok idle · 8,203 in use
  4. guarding-destructive-operationskajisho5/ffmpeg-skill

    Add and review preconditions on operations that delete, overwrite, rewrite history, or resolve a caller-supplied name to a filesystem path — refusing instead of warning, placing the guard ahead of the first mutation, structural classification rather than string-prefix matching, name validation plus resolved-path containment as two independent checks, why a guard on the destructive path is invisible to the dry-run, and mutation-testing each half separately. Use when writing or reviewing a `--rebuild`/`--reset`/`--purge` command, a bulk delete, a history rewrite, an `rm -rf`-shaped step, or any code that turns an argument into a file path.

    2.0k144 tok idle · 2,272 in use
  5. keeping-git-repos-cleankajisho5/ffmpeg-skill

    Prevents, detects, and remediates files that should never be committed — secrets (.env, API tokens, hardcoded credentials) and dev artifacts (build output, scratch databases, editor/OS files). Covers .gitignore (and why it does not untrack), git rm --cached, auditing tracked files, history scrubbing, and credential rotation. Use when a repo has committed secrets or junk, when setting up a new repo's ignore rules, or when reviewing what a repo actually tracks.

    2.0k108 tok idle · 2,014 in use
  6. managing-python-releaseskajisho5/ffmpeg-skill

    Manages Python library releases including semantic versioning, changelog maintenance (Keep a Changelog format), release automation with GitHub Actions, and deprecation workflows. Use when planning releases, writing changelogs, automating release pipelines, or communicating breaking changes.

    2.0k58 tok idle · 1,059 in use
  7. reproducing-ci-locallykajisho5/ffmpeg-skill

    Run the CI gate on your machine so it agrees with the runner — deriving the exact command, paths, markers, and env from the workflow file instead of the Makefile, unblocking gate steps that short-circuit and hide the next failure, pinning the linter version CI resolves, building the interpreter/toolchain environment the runner builds, and confirming the run is green instead of explaining a red job away. Use when a check passes locally but fails in CI (or the reverse), when a lint/format job goes red on an untouched file, when setting up a local dev loop for an unfamiliar repo, or before pushing a branch you expect to merge.

    2.0k140 tok idle · 2,656 in use
  8. reviewing-ffmpeg-skill-changeskajisho5/ffmpeg-skill

    Review a change to the ffmpeg-skill repository for the failures its own contract makes possible — a claim in a result document that is true at one layer and false at the layer a caller reads, a new flag that reaches the code but not the contract/docs/demo surfaces, a "bug" that docs/design-decisions.md already decided with a pinning test, a fix with no regression test, a new runtime dependency or a raw ffmpeg shell call that breaks the scope boundary, a SKILL.md line added without one trimmed, a review that re-derives findings from a summary instead of the tree at the reviewed commit. Use when asked to review a PR or diff in this repository, when authoring code here and needing a pre-commit check, or when triaging an external review or audit report about this codebase.

    2.0k178 tok idle · 2,079 in use