Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .claude/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Type this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
skills CLI
$ npx skills add sean-brydon/berthd --skill integrate-branches -a codex
Project install goes to .agents/skills/; add -g for ~/.codex/skills/.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .agents/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
skills CLI
$ npx skills add sean-brydon/berthd --skill integrate-branches -a cursor
Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .cursor/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
skills CLI
$ npx skills add sean-brydon/berthd --skill integrate-branches -a gemini-cli
Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .gemini/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Installs for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
skills CLI
$ npx skills add sean-brydon/berthd --skill integrate-branches -a github-copilot
Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .github/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
skills CLI
$ npx skills add sean-brydon/berthd --skill integrate-branches -a opencode
OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
Install the "integrate-branches" agent skill from https://github.com/sean-brydon/berthd/tree/main/.claude/skills/integrate-branches into .opencode/skills/integrate-branches/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "integrate-branches", then confirm the skill loads.
OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
Skill name
integrate-branches
GitHub stars
291
Token cost
~467 tokens
SKILL.md length
215 words
Files
1
Skills in repo
10
Repo updated
First seen
Licence
MIT
At a glance
Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result.
Works in 6 steps: Start in a scratch worktree from the… → Merge one branch at a time, smallest and… → Resolve the usual conflicts → …
More branches need to land together
Calls git, node and pnpm
Tasks that involve Subagents
What it does
Integrate Branches is an agent skill from sean-brydon/berthd. Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result. Use when two or more branches need to land together.
Its SKILL.md is about 470 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Agent Workflows, covering Subagents. It works with npm. The repository describes itself as: Run coding agents on your dev boxes: worktrees, terminals, orchestration, kits and automations, with a desktop app. The licence is MIT.
When your agent uses it
More branches need to land together
Tasks that involve Subagents
Example prompts
“/integrate-branches”
Workflow steps
6 steps, taken from the first numbered list in SKILL.md.
1Start in a scratch worktree from the current main, never the user's checkout
2Merge one branch at a time, smallest and most foundational first, so the big UI branches land last on top of everything they read
3Resolve the usual conflicts
4Look for breaks that merged cleanly but fail in practice, e.g. one branch renames a control another branch's test clicks, or one slows a…
5Run the checks in AGENTS.md on the final tree, with a fresh CI=true pnpm install --frozen-lockfile and go test -race ./....
6Push the branch and open one PR. Its body lists the merge order, each conflict and how it was resolved, the cross-branch fixes, and the…
What it can do on your machine
Read from SKILL.md and the folder at commit c8e2f99. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
node
pnpm
go
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git and pnpm, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Integrate Branches loads about 467 tokens when it runs. Until then it costs about 57 tokens; SKILL.md has 215 words of instructions outside code blocks.
Always· name and description, kept in context so the agent knows when to use it
~57
When it runs· the whole SKILL.md, loaded when a task matches
~467
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
Download SKILL.mdSave it as .claude/skills/integrate-branches/SKILL.md (or your agent's skills folder).
name
integrate-branches
description
Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result. Use when two or more branches need to land together.
Integrating branches
Start in a scratch worktree from the current main, never the user's checkout:sh
Merge one branch at a time, smallest and most foundational first, so the big UI branches land last on top of everything they read:sh
git merge --no-ff --no-edit origin/<branch>
Don't rebase other people's branches. git merge-tree --write-tree origin/main origin/<branch> previews the conflicts.
Resolve the usual conflicts:
docs/changelog.mdx: keep every bullet from both sides under ## Unreleased.
app/package.json"test": the union of both file lists. It stays the last key, with no trailing comma; check with node -e "require('./app/package.json')".
Other package.json scripts and dependencies: keep both sides.
Mocks (app/src/lib/mock*.ts) and capability lists: the union of both.
Real code: keep both intents. Read both sides; don't pick one.
Look for breaks that merged cleanly but fail in practice, e.g. one branch renames a control another branch's test clicks, or one slows a poll another relies on. Run the specs of every area both branches touched.
Run the checks in AGENTS.md on the final tree, with a fresh CI=true pnpm install --frozen-lockfile and go test -race ./....
Push the branch and open one PR. Its body lists the merge order, each conflict and how it was resolved, the cross-branch fixes, and the check results. After it merges, delete the merged branches and their worktrees.
Integrate Branches next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
Hands coding work to the Claude Code CLI from the terminal in print, interactive tmux or background mode, only when you explicitly ask for Claude Code.
Delegates code generation, editing and explanation tasks to the OpenAI Codex CLI, with commands for interactive, auto-edit, question-only and model-specific runs.
Execute via @babysitter. Use this skill when asked to babysit a task, do anything that is structured process-driven (even a loop) or whenever it is called…
Hands coding work such as codebase questions, bug fixes, refactors and PR reviews to the Qwen Code CLI, driven through acpx instead of scraped terminal sessions.
Patterns for running multi-agent swarms on research, development and testing work, with four topologies and a four-phase research swarm built on claude-flow MCP tools.
Use berth to work across development boxes — list repos (locations) and their worktrees, make a worktree or a task (a worktree with an agent in it), start or read terminal sessions, find which port…
Show the user data as a chart, table, diagram, notes or one small page in their Shipyard app instead of a wall of text — write a berth.chart JSON, a CSV, Mermaid, Markdown or a self-contained HTML…
Use your worktree's own page in a headless browser on the box — open it, read a compact snapshot with @refs, click, fill, press keys, wait, take a screenshot to a file, read console errors, and set…
Automate berth with hooks — run a command when something happens (an agent finishes or needs the user, a worktree is created or removed, a session starts) or gate an action with a before: hook that…
Drive other coding agents through berth — prompt a running agent, wait for its turn to end, run a check in its worktree, loop until a check passes, hand work to a fresh agent in a new worktree, ask…
Run a worktree's dev server on its own port and show the page to the user in their Shipyard app — start the app on $BERTHPORT, check it answers, and open it as a browser tab next to your terminal…
Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result. Integrate Branches is an agent skill from sean-brydon/berthd. Merge several feature branches (often from parallel agents) into one branch for a single PR, resolving the repo's usual conflicts and checking the result.
When should I use Integrate Branches?
Integrate Branches fits situations like: more branches need to land together; tasks that involve Subagents.
How do I install Integrate Branches in Claude Code?
Run `npx skills add sean-brydon/berthd --skill integrate-branches -a claude-code`. Or copy the skill folder (.claude/skills/integrate-branches in sean-brydon/berthd) into .claude/skills/integrate-branches in your project. Claude Code loads it when a task matches its description.
How do I install Integrate Branches in Codex?
Run `npx skills add sean-brydon/berthd --skill integrate-branches -a codex`. Or copy the skill folder (.claude/skills/integrate-branches in sean-brydon/berthd) into .agents/skills/integrate-branches in your project. Codex loads it when a task matches its description.
Can I use Integrate Branches in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add sean-brydon/berthd --skill integrate-branches -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/integrate-branches, .gemini/skills/integrate-branches, .github/skills/integrate-branches and .opencode/skills/integrate-branches in your project.
What does Integrate Branches need to run?
Going by SKILL.md and its folder, Integrate Branches needs the command-line tools its instructions call (git, node, pnpm and go).
Does Integrate Branches access the network?
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Integrate Branches safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Integrate Branches use?
Integrate Branches is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Integrate Branches use?
About 467 tokens (SKILL.md is roughly 1.9k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Integrate Branches?
Skills that share tags, products or a category with Integrate Branches: Ruflo Multi-Agent Orchestration (ruvnet/ruflo, 74k stars), Claude Code Delegation (XiaomiMiMo/MiMo-Code, 14k stars), OpenAI Codex CLI Bridge (taracodlabs/aiden, 852 stars) and Babysitter Process Runner (a5c-ai/babysitter, 1.8k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Integrate Branches?
sean-brydon (a GitHub user) maintains it in sean-brydon/berthd, which has 291 GitHub stars. The repository holds 10 skills in this directory. The repository was last updated on October 9, 2026.
Source: sean-brydon/berthd on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.
