Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .claude/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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 mrchantey/beet --skill worktree-sync-upstream -a codex
Project install goes to .agents/skills/; add -g for ~/.codex/skills/.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .agents/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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 mrchantey/beet --skill worktree-sync-upstream -a cursor
Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .cursor/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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 mrchantey/beet --skill worktree-sync-upstream -a gemini-cli
Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .gemini/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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 mrchantey/beet --skill worktree-sync-upstream -a github-copilot
Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .github/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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 mrchantey/beet --skill worktree-sync-upstream -a opencode
OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
Install the "worktree-sync-upstream" agent skill from https://github.com/mrchantey/beet/tree/main/.agents/skills/worktree-sync-upstream into .opencode/skills/worktree-sync-upstream/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "worktree-sync-upstream", 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
worktree-sync-upstream
GitHub stars
135
Token cost
~699 tokens
SKILL.md length
376 words
Files
1
Skills in repo
11
Repo updated
First seen
Licence
Apache-2.0
At a glance
Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history.
Works in 5 steps: Make sure the local upstream branch is… → Confirm the main repo working tree is… → Pull: replay only your commits onto the… → …
Tasks that involve Git worktrees
SKILL.md covers How these worktrees work, The duplication pitfall, Clean sync and If history is already tangled, plus 1 more section
Calls git and just
What it does
Worktree Sync Upstream is an agent skill from mrchantey/beet. Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history. Use from inside a worktree.
Its SKILL.md is about 700 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 Development, covering Git worktrees. It works with Git. The repository describes itself as: A malleable engine built on interoperable standards. The licence is Apache-2.0.
When your agent uses it
Tasks that involve Git worktrees
Example prompts
“/worktree-sync-upstream”
Workflow steps
5 steps, taken from the first numbered list in SKILL.md.
1Make sure the local upstream branch is current with its origin.
2Confirm the main repo working tree is clean (the fast-forward in step 4 touches it).
3Pull: replay only your commits onto the latest upstream, staying detached
4Push: fast-forward the upstream branch to this worktree's HEAD
Read from SKILL.md and the folder at commit 38648b8. 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
just
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, 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
Worktree Sync Upstream loads about 699 tokens when it runs. Until then it costs about 60 tokens; SKILL.md has 376 words of instructions outside code blocks.
Always· name and description, kept in context so the agent knows when to use it
~60
When it runs· the whole SKILL.md, loaded when a task matches
~699
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/worktree-sync-upstream/SKILL.md (or your agent's skills folder).
name
worktree-sync-upstream
description
Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history. Use from inside a worktree.
Worktree Sync Upstream
Sync this worktree with its upstream branch in the main repo at ~/me/beet, in both directions. Do not delete this worktree and do not create a branch for it.
How these worktrees work
This is a Zed-style worktree: a separate cloned directory in detached HEAD (no branch), so parallel agents can each own a directory without competing for branch names. Keep it detached.
Think of the worktree as <upstream-branch> + your own commits on top. The upstream branch (eg beet_stack) is checked out in the main repo. It does not matter how long-lived the worktree is, as long as it stays a clean linear extension of upstream.
The duplication pitfall
Rebasing or replaying commits you do not own mints new hashes for identical changes. Git then sees two lineages with the same content, so every later sync conflicts or stacks up duplicate commits (same message, different hash). The rule that avoids this: only ever rebase YOUR commits, and only ever fast-forward the upstream branch. Never git merge the full divergent history in either direction.
Clean sync
Run from this worktree. Substitute the upstream branch name for <up>.
Make sure the local upstream branch is current with its origin.
Confirm the main repo working tree is clean (the fast-forward in step 4 touches it).
Pull: replay only your commits onto the latest upstream, staying detached:sh
git rebase <up>
This brings in all upstream work and lands your commits on top. Resolve any conflicts carefully.
Push: fast-forward the upstream branch to this worktree's HEAD:sh
Symptom: many commits in <up>..HEAD share messages with upstream commits (duplicates from a past rebase). Recover by replaying only the genuinely unique commits:
Back up first: git tag backup/<name> HEAD.
Inspect git log --oneline <up>..HEAD and find the last duplicate commit (everything below your real work).
Replay only your work onto upstream: git rebase --onto <up> <last-duplicate-commit>.
Verify no content changed: git diff HEAD backup/<name> is empty.
Worktree Sync Upstream 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.
Worktree Sync Upstream compared with similar skills
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
A skill your agent uses when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for…
Sorts a backlog of open pull requests into must-merge, candidate, superseded and deferred, writes a triage doc and works the merge loop before a release.
Builds a Cap feature in an isolated Git worktree with disposable dev resources, verification, a recorded demo and a neutral pull request, started with /building.
Scaffold a new beet downstream repo (beet<name, a sibling of this checkout depending on the beet facade by path) from the template, register it with downstream-sync and run the first sync.
Run the workspace example smoke set to catch regressions unit tests miss, covering every feature gate combination with self-terminating examples and curl-probed servers.
Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history. Worktree Sync Upstream is an agent skill from mrchantey/beet. Sync a detached-HEAD worktree with its upstream branch in the main repo in both directions, rebasing only owned commits and fast-forwarding upstream, with recovery steps for tangled history.
How do I install Worktree Sync Upstream in Claude Code?
Run `npx skills add mrchantey/beet --skill worktree-sync-upstream -a claude-code`. Or copy the skill folder (.agents/skills/worktree-sync-upstream in mrchantey/beet) into .claude/skills/worktree-sync-upstream in your project. Claude Code loads it when a task matches its description.
How do I install Worktree Sync Upstream in Codex?
Run `npx skills add mrchantey/beet --skill worktree-sync-upstream -a codex`. Or copy the skill folder (.agents/skills/worktree-sync-upstream in mrchantey/beet) into .agents/skills/worktree-sync-upstream in your project. Codex loads it when a task matches its description.
Can I use Worktree Sync Upstream 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 mrchantey/beet --skill worktree-sync-upstream -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/worktree-sync-upstream, .gemini/skills/worktree-sync-upstream, .github/skills/worktree-sync-upstream and .opencode/skills/worktree-sync-upstream in your project.
What does Worktree Sync Upstream need to run?
Going by SKILL.md and its folder, Worktree Sync Upstream needs the command-line tools its instructions call (git and just).
Does Worktree Sync Upstream 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 Worktree Sync Upstream 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 Worktree Sync Upstream use?
Worktree Sync Upstream is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Worktree Sync Upstream use?
About 699 tokens (SKILL.md is roughly 2.8k 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 Worktree Sync Upstream?
Skills that share tags, products or a category with Worktree Sync Upstream: Finishing a Development Branch (obra/superpowers, 296k stars), Finishing A Development Branch (farm-fe/farm, 5.6k stars), Git Worktree Cleanup (lobehub/lobehub, 83k stars) and Pre-Release PR Triage (jamiepine/voicebox, 57k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Worktree Sync Upstream?
mrchantey (a GitHub user) maintains it in mrchantey/beet, which has 135 GitHub stars. The repository holds 11 skills in this directory. The repository was last updated on October 7, 2026.
Source: mrchantey/beet on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.
