Git Worktree Manager

Use a two-layer .env pattern — shared base + worktree-specific overrides.

Shared file (non-secrets, safe to commit):

# ~/myapp/.env.shared — committed to git
NEXT_PUBLIC_APP_NAME=MyApp
NEXT_PUBLIC_SENTRY_DSN=https://abc@sentry.io/123
NODE_ENV=development
API_TIMEOUT_MS=5000

Per-worktree .env.local sources the shared file:

# myapp-billing/.env.local — NOT committed
# Load shared vars
set -a && source ~/myapp/.env.shared && set +a

# Worktree-specific overrides
PORT=3002
DATABASE_URL=postgresql://localhost/myapp_billing_dev

One-command update across all worktrees:

#!/bin/bash
# scripts/add-shared-env.sh VAR_NAME value
SHARED_VAR="$1"
SHARED_VALUE="$2"

# Add to shared file
echo "${SHARED_VAR}=${SHARED_VALUE}" >> ~/myapp/.env.shared

# Notify all worktrees
git worktree list | awk '{print $1}' | tail -n +2 | while read dir; do
  echo "Restart pnpm dev in: $dir"
done

echo "All worktrees will pick up $SHARED_VAR on next server restart"

Usage: ./scripts/add-shared-env.sh NEXT_PUBLIC_FEATURE_FLAG_DARK_MODE true

Secrets (API keys, DB passwords) stay in 1Password and are pulled separately per engineer — never go into .env.shared.

Audit before deleting — confirm branches are actually merged and worktrees have no uncommitted work.

Step 1: Check which branches are merged

# Branches that are safe to delete (already in main)
git branch --merged main | grep 'feature/'

# Branches NOT yet merged — do not touch these
git branch --no-merged main

Step 2: Check for uncommitted changes in each worktree

git worktree list | awk '{print $1}' | tail -n +2 | while read dir; do
  status=$(git -C "$dir" status --short)
  if [ -n "$status" ]; then
    echo "DIRTY: $dir"
    echo "$status"
  else
    echo "CLEAN: $dir"
  fi
done

Step 3: Check for stashes

# Do this for each worktree before removing
git -C ../myapp-billing stash list
# If any stashes exist, extract them first:
git -C ../myapp-billing stash show -p > ~/saved-billing-stash.patch

Step 4: Remove each merged worktree

# Two steps per worktree
git worktree remove ../myapp-billing --force
git branch -d feature/billing-redesign
git push origin --delete feature/billing-redesign

Clean up stale references:

git worktree prune
git branch -vv | grep 'gone]' | awk '{print $1}' | xargs git branch -d