Agent skill

Git Worktrees

by heyitsnoah in heyitsnoah/claudesidian

Work with git worktrees for isolated parallel development. An agent skill from heyitsnoah/claudesidian.

MITAuto-check: notesDevelopment

Install Git Worktrees

skills CLI

$ npx skills add heyitsnoah/claudesidian --skill git-worktrees -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/git-worktrees .claude/skills/git-worktrees && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Paste into Claude Code

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .claude/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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.

$skill-installer

$skill-installer install https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees

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 heyitsnoah/claudesidian --skill git-worktrees -a codex

Project install goes to .agents/skills/; add -g for ~/.codex/skills/.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees --agent codex

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/git-worktrees .agents/skills/git-worktrees && rm -rf skills-src

Use ~/.agents/skills/ instead of .agents/skills for a personal install.

Codex skills documentation · loads skills from .agents/skills/

Paste into Codex

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .agents/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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 heyitsnoah/claudesidian --skill git-worktrees -a cursor

Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees --agent cursor

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/git-worktrees .cursor/skills/git-worktrees && rm -rf skills-src

Use ~/.cursor/skills/ instead of .cursor/skills for a personal install.

Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/

Paste into Cursor

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .cursor/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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.

gemini skills install

$ gemini skills install https://github.com/heyitsnoah/claudesidian.git --path .agents/skills/git-worktrees

--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 heyitsnoah/claudesidian --skill git-worktrees -a gemini-cli

Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees --agent gemini-cli

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/git-worktrees .gemini/skills/git-worktrees && rm -rf skills-src

Use ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.

Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/

Paste into Gemini CLI

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .gemini/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees

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 heyitsnoah/claudesidian --skill git-worktrees -a github-copilot

Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/git-worktrees .github/skills/git-worktrees && rm -rf skills-src

Use ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.

GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/

Paste into GitHub Copilot

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .github/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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 heyitsnoah/claudesidian --skill git-worktrees -a opencode

OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.

GitHub CLI

$ gh skill install heyitsnoah/claudesidian git-worktrees --agent opencode

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/heyitsnoah/claudesidian.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/git-worktrees .opencode/skills/git-worktrees && rm -rf skills-src

Use ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.

OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/

Paste into OpenCode

Install the "git-worktrees" agent skill from https://github.com/heyitsnoah/claudesidian/tree/main/.agents/skills/git-worktrees into .opencode/skills/git-worktrees/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-worktrees", 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: git-worktrees
GitHub stars: 2.6k
Token cost: ~1.1k tokens
SKILL.md length: 241 words
Files: 1
Skills in repo: 17
Repo updated: Apr 11, 2026
First seen: Oct 7, 2026
Licence: MIT

At a glance

Work with git worktrees for isolated parallel development. An agent skill from heyitsnoah/claudesidian.

Starting feature work in isolation
SKILL.md covers Overview, When to Use Worktrees, Quick Reference and Creating Worktrees, plus 6 more sections
Calls git, npm and gh
Need separate workspace without branch switching

What it does

Git Worktrees is an agent skill from heyitsnoah/claudesidian. Work with git worktrees for isolated parallel development. Use when starting feature work in isolation, when need separate workspace without branch switching, or when cleaning up worktrees after PR merge.

Its SKILL.md is about 1.1k 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 licence is MIT.

When your agent uses it

Starting feature work in isolation
Need separate workspace without branch switching
Cleaning up worktrees after PR merge

Example prompts

“/git-worktrees”

Requirements

Node.js

What it can do on your machine

Read from SKILL.md and the folder at commit 6c56f35. 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
- npm
- gh
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, npm and gh, 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

Git Worktrees loads about 1.1k tokens when it runs. Until then it costs about 55 tokens; SKILL.md has 241 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it: ~55
When it runs · the whole SKILL.md, loaded when a task matches: ~1.1k

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: notes

The automated check noted patterns worth knowing about, such as sudo or a known installer.

NoteMentions a .env fileSKILL.md:76
```
cp ../.env .env.local
```

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.

SKILL.md

The full file from heyitsnoah/claudesidian at commit 6c56f35, republished under its MIT licence (© heyitsnoah). 241 words, ~1,101 tokens.

Download SKILL.mdSave it as .claude/skills/git-worktrees/SKILL.md (or your agent's skills folder).

name: git-worktrees
description: Work with git worktrees for isolated parallel development. Use when starting feature work in isolation, when need separate workspace without branch switching, or when cleaning up worktrees after PR merge.

Git Worktrees

Overview

Git worktrees create isolated workspaces sharing the same repository, allowing work on multiple branches simultaneously without switching. Each worktree is a separate directory with its own working tree, but they share the same .git history.

When to Use Worktrees

Parallel development: Work on feature A while feature B builds/tests
Code review: Check out PR branch without disrupting current work
Experiments: Try something risky without affecting main workspace
Long-running tasks: Keep main branch available while feature develops

Quick Reference

Action	Command
List worktrees	`git worktree list`
Create worktree	`git worktree add <path> -b <branch>`
Create from existing branch	`git worktree add <path> <branch>`
Remove worktree	`git worktree remove <path>`
Prune stale worktrees	`git worktree prune`

Creating Worktrees

New Feature Branch

bash

# Create worktree with new branch
git worktree add .worktrees/my-feature -b feat/my-feature

# Or specify base branch
git worktree add .worktrees/my-feature -b feat/my-feature main

From Existing Branch

bash

# Check out existing remote branch
git worktree add .worktrees/pr-review origin/fix-bug

# Check out existing local branch
git worktree add .worktrees/hotfix hotfix/urgent-fix

Directory Structure

project/
├── .git/                    # Shared git history
├── .worktrees/              # Convention: keep worktrees here
│   ├── feature-a/           # First worktree
│   └── feature-b/           # Second worktree
└── src/                     # Main worktree files

Setup After Creating Worktree

After creating a worktree, you typically need to:

bash

cd .worktrees/my-feature

# Install dependencies
npm install  # or pnpm install, yarn, etc.

# Copy any required env files
cp ../.env .env.local

# Verify setup
npm test

Safety Rules

NEVER remove a worktree with uncommitted changes without confirmation.

bash

# Check for uncommitted changes first
git -C .worktrees/my-feature status --porcelain

# If empty, safe to remove
git worktree remove .worktrees/my-feature

# Delete the branch after merge (-d is safe, fails if not merged)
git branch -d feat/my-feature

Removal Decision Matrix

PR Merged?	Uncommitted Changes?	Action
Yes	No	Safe to remove
Yes	Yes	Ask user - changes will be lost
No	No	Do NOT remove - work not preserved
No	Yes	Do NOT remove - active work

Cleaning Up Worktrees

Manual Cleanup

bash

# 1. Check if work is merged (if using GitHub)
gh pr list --head feat/my-feature --state merged

# 2. Check for uncommitted changes
git -C .worktrees/my-feature status --porcelain

# 3. Remove worktree (only if merged or confirmed with user)
git worktree remove .worktrees/my-feature

# 4. Delete branch
git branch -d feat/my-feature

Prune Stale Worktrees

If a worktree directory was deleted manually:

bash

git worktree prune

Common Patterns

Review a PR

bash

# Create worktree from PR branch
git fetch origin pull/123/head:pr-123
git worktree add .worktrees/pr-123 pr-123

# Review, test, then clean up
git worktree remove .worktrees/pr-123
git branch -D pr-123

Parallel Feature Development

bash

# Main work continues in project root
# Start new feature in worktree
git worktree add .worktrees/new-api -b feat/new-api

# Work on both simultaneously
code .worktrees/new-api  # Opens new VS Code window

Troubleshooting

"Branch already checked out"

A branch can only be checked out in one worktree at a time:

bash

# Find where branch is checked out
git worktree list

# Remove that worktree first, or use different branch

"Worktree directory not empty"

bash

# Force add if directory exists but isn't a worktree
git worktree add --force <path> <branch>

Locked Worktree

If a worktree is locked (prevents accidental removal):

bash

# Unlock it
git worktree unlock <path>

# Then remove
git worktree remove <path>

Files

Just SKILL.md in .agents/skills/git-worktrees of heyitsnoah/claudesidian.

Open the folder on GitHubat commit 6c56f35

Compare with similar skills

Git Worktrees 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.

Git Worktrees compared with similar skills
Skill	Stars	Used in	Tokens	Auto-check	Licence	Repo updated
Git Worktrees this skillheyitsnoah/claudesidian	2.6k	—	~1.1k	Automated safety check: Notes	MIT	5 mo ago
Git Worktree IsolationjnMetaCode/superpowers-zh	8.3k	1 repos	~982	Automated safety check: Pass	MIT	3 days ago
WorktreeAgentsMesh/AgentsMesh	2.4k	—	~553	Automated safety check: Notes	Custom licence	14 days ago
Cursor Composer Task DelegateChachamaru127/claude-code-harness	3.2k	—	~4.4k	Automated safety check: Notes	MIT	2 days ago
Git Worktree Setupk8zdev/k8z	155	—	~930	Automated safety check: Pass	None	3 mo ago
New Featuremichaelshimeles/skills	1.3k	1 repos	~699	Automated safety check: Pass	None	3 days ago

Similar skills

Git Worktree Isolation
jnMetaCode/superpowers-zh
Sets up an isolated workspace before feature work or plan execution, preferring native worktree tools and falling back to git worktree, with instructions in Chinese.
8.3k GitHub starsUsed in 1 repo~982 tokens
DevelopmentAuto-check passed
Worktree
AgentsMesh/AgentsMesh
Creates or reuses an isolated AgentsMesh Git worktree from a verified base branch, preserves existing changes, and optionally starts the worktree-scoped development environment.
2.4k GitHub stars~553 tokensUpdated 14 days ago
DevelopmentAuto-check: notes
Cursor Composer Task Delegate
Chachamaru127/claude-code-harness
Hands one implementation task to Cursor Composer in an isolated git worktree, then reviews its diff and cherry-picks the result into the main branch.
3.2k GitHub stars~4.4k tokensUpdated 2 days ago
DevelopmentAuto-check: notes
Git Worktree Setup
k8zdev/k8z
Automate git worktree creation and copy private files (not tracked in git) to new workdirs.
155 GitHub stars~930 tokensUpdated 3 mo ago
DevelopmentAuto-check passed
New Feature
michaelshimeles/skills
Start a new task in an isolated Git worktree branched from origin/main so multiple agents can work on the same repo in parallel without conflicts.
1.3k GitHub starsUsed in 1 repo~699 tokens
DevelopmentAuto-check passed
Mori Agent Bridge
vaayne/mori
Use Mori CLI to enable agent-to-agent communication and coordination across Mori-managed panes.
303 GitHub stars~1.7k tokensUpdated 2 mo ago
DevelopmentAuto-check passed

Questions about Git Worktrees

What does Git Worktrees do?

Work with git worktrees for isolated parallel development. An agent skill from heyitsnoah/claudesidian. Git Worktrees is an agent skill from heyitsnoah/claudesidian. Work with git worktrees for isolated parallel development.

When should I use Git Worktrees?

Git Worktrees fits situations like: starting feature work in isolation; need separate workspace without branch switching; cleaning up worktrees after PR merge.

How do I install Git Worktrees in Claude Code?

Run `npx skills add heyitsnoah/claudesidian --skill git-worktrees -a claude-code`. Or copy the skill folder (.agents/skills/git-worktrees in heyitsnoah/claudesidian) into .claude/skills/git-worktrees in your project. Claude Code loads it when a task matches its description.

How do I install Git Worktrees in Codex?

Run `npx skills add heyitsnoah/claudesidian --skill git-worktrees -a codex`. Or copy the skill folder (.agents/skills/git-worktrees in heyitsnoah/claudesidian) into .agents/skills/git-worktrees in your project. Codex loads it when a task matches its description.

Can I use Git Worktrees 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 heyitsnoah/claudesidian --skill git-worktrees -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-worktrees, .gemini/skills/git-worktrees, .github/skills/git-worktrees and .opencode/skills/git-worktrees in your project.

What does Git Worktrees need to run?

Going by SKILL.md and its folder, Git Worktrees needs the command-line tools its instructions call (git, npm and gh). Our summary lists: Node.js.

Does Git Worktrees access the network?

SKILL.md contains no URLs. Its commands use git, npm and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Worktrees safe to install?

Our automated static check of SKILL.md found notes only (mentions a .env file), nothing it rates as a warning. It is not a guarantee. Review the folder before installing.

What licence does Git Worktrees use?

Git Worktrees 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 Git Worktrees use?

About 1.1k tokens (SKILL.md is roughly 4.4k 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 Git Worktrees?

Skills that share tags, products or a category with Git Worktrees: Git Worktree Isolation (jnMetaCode/superpowers-zh, 8.3k stars), Worktree (AgentsMesh/AgentsMesh, 2.4k stars), Cursor Composer Task Delegate (Chachamaru127/claude-code-harness, 3.2k stars) and Git Worktree Setup (k8zdev/k8z, 155 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Worktrees?

heyitsnoah (a GitHub user) maintains it in heyitsnoah/claudesidian, which has 2,597 GitHub stars. The repository holds 17 skills in this directory. The repository was last updated on April 11, 2026.

Source: heyitsnoah/claudesidian on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.

Install Git Worktrees

Facts

At a glance

What it does

When your agent uses it

Example prompts

Requirements

What it can do on your machine

Tool permissions

Runs code

Network

Credentials

Context cost

Safety

SKILL.md

Git Worktrees

Overview

When to Use Worktrees

Quick Reference

Creating Worktrees

New Feature Branch

From Existing Branch

Directory Structure

Setup After Creating Worktree

Safety Rules

Removal Decision Matrix

Cleaning Up Worktrees

Manual Cleanup

Prune Stale Worktrees

Common Patterns

Review a PR

Parallel Feature Development

Troubleshooting

"Branch already checked out"

"Worktree directory not empty"

Locked Worktree

Files

Compare with similar skills

Similar skills

More from heyitsnoah/claudesidian

Related

Questions about Git Worktrees