worktrees:new

Included with Lifetime

$97 forever

Use when creating a new git worktree. Handles gitignore setup, worktree creation, and provides guidance. Invoke with "/worktrees:new <name>" or when user mentions "create worktree", "new worktree", "start feature in worktree", or "isolated workspace".

General

What this skill does


# Create New Worktree

Create an isolated worktree for parallel development.

## Arguments

- `<name>` - Worktree and branch name (required)
- `--base <branch>` - Base branch (default: main)
- `--lock` - Lock worktree after creation

## Procedure

### 1. Verify Gitignore Setup

**First, check if `.worktrees/` is in `.gitignore`:**

```bash
grep -q "^\.worktrees" .gitignore 2>/dev/null && echo "OK: .worktrees already gitignored" || echo "MISSING: Need to add .worktrees to gitignore"
```

**If missing, add and commit:**

```bash
echo ".worktrees/" >> .gitignore
git add .gitignore
git commit -m "chore: add .worktrees to gitignore"
```

> **Why gitignore?** Each worktree contains a complete checkout. Without gitignoring, you'd accidentally commit nested copies of your entire codebase.

### 2. Create the Worktree

**Standard creation (new branch from base):**

```bash
# Replace <name> with the provided name, <base> with --base value or "main"
git worktree add -b feature/<name> .worktrees/<name> <base>
```

**With lock flag:**

```bash
git worktree add --lock -b feature/<name> .worktrees/<name> <base>
```

### 3. Verify Creation

```bash
git worktree list
```

Expected output shows new worktree:
```
/path/to/project              abc1234 [main]
/path/to/project/.worktrees/<name>  abc1234 [feature/<name>]
```

### 4. Navigate to Worktree

```bash
cd .worktrees/<name>
```

## Next Steps

After creating the worktree:

1. **Start development** in the isolated environment
2. **Make atomic commits** as you work
3. **Push regularly** to remote: `git push -u origin feature/<name>`
4. When done, use `/worktrees:finish` to clean up

## Common Options

| Scenario | Command |
|----------|---------|
| Basic feature | `git worktree add -b feature/my-feature .worktrees/my-feature main` |
| From release branch | `git worktree add -b hotfix/urgent .worktrees/urgent release/v2` |
| Locked worktree | `git worktree add --lock -b feature/critical .worktrees/critical main` |
| With existing branch | `git worktree add .worktrees/existing-branch existing-branch` |

## Troubleshooting

### Branch Already Checked Out

**Error:** `fatal: 'branch-name' is already checked out at '/path'`

**Solution:** Each branch can only exist in one worktree. Either:
- Use the existing worktree: `git worktree list`
- Create with a different branch name
- Remove the existing worktree first

### Directory Already Exists

**Error:** `fatal: destination path already exists`

**Solution:** The `.worktrees/<name>` directory exists. Either:
- Choose a different name
- Remove existing: `rm -rf .worktrees/<name> && git worktree prune`

## Quick Reference

```bash
# Create worktree with new branch
git worktree add -b <branch> .worktrees/<name> [base]

# Create worktree with existing branch
git worktree add .worktrees/<name> <branch>

# List worktrees
git worktree list

# Lock/unlock
git worktree lock .worktrees/<name>
git worktree unlock .worktrees/<name>
```

Files: 1

Size: 3.5 KB

Complexity: 13/100

Category: General

Source: https://github.com/aaronbassett/agent-foundry/tree/main/plugins/worktrees/skills/new

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).

Generalscripts

relationship-science-coach

Included

Use this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.

Generalscripts

building-sf-integrations

Included

Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).

Generalscripts

venue-templates

Included

Access comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.

Generalscripts

let-fate-decide

Included

Draws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.

Generalscripts

net-ops

Included

Cross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.

Generalscripts