Worker Worktree

"Parallel development without conflicts – each agent works in their own worktree."

When to Use This Skill

Use when:

• Setting up parallel development (Developer + Tech Artist)
• Navigating between worktree and master branches
• Merging changes after QA validation
• Resolving worktree conflicts

Use proactively:

• Before starting any work in your worktree
• When merging main branch changes
• Before committing worktree changes

Quick Start

Create if not exists

git worktree add ../developer-worktree -b developer-worktree

Navigate and start

cd ../developer-worktree

Example 2: Daily workflow
```bash
# Navigate to worktree
cd ../developer-worktree

# Merge latest from main
git fetch origin main
git merge origin/main

# Work happens here...
# ...

# Commit and push
git commit -m "feat: my changes"
git push origin developer-worktree

Example 3: QA merge after validation passes

# QA (on main branch):
git checkout main
git fetch origin developer-worktree
git merge origin/developer-worktree
git push origin main

Worktree Convention

MUST follow: {agent}-worktree

Daily Workflow

Before Starting Work

# 1. Navigate to your worktree
cd ../{agent}-worktree

# 2. Merge latest from main
git fetch origin main
git merge origin/main

# 3. Resolve conflicts if any
git status

# 4. Start working

After Committing

# Push to worktree branch
git push origin {agent}-worktree

QA Merge Protocol

QA Agent ONLY:

When Validation PASSES

# 1. Switch to main
git checkout main

# 2. Fetch and merge
git fetch origin {agent}-worktree
git merge origin/{agent}-worktree

# 3. Push merged
git push origin main

When Validation Fails

# DO NOT MERGE
# Send bug report to agent
# Agent fixes in their worktree

Master Branch Coordination (CRITICAL)

THE GOLDEN RULE: Worktrees are for CODE/ASSETS ONLY. All coordination happens in master.

File Conflict Prevention

If both need same file: PM assigns sequentially, not parallel.

Best Practices

✅ DO:

• Always merge main before starting work
• Commit frequently in your worktree
• Push worktree branch after each commit
• Resolve merge conflicts promptly

❌ DON'T:

• Create worktree if one already exists
• Work in main directory (use your worktree)
• Merge to main yourself (QA does this after validation)
• Delete worktree without QA approval

Quick Reference Commands

Troubleshooting

Worktree Already Exists

git worktree list
# If listed, just navigate:
cd ../{agent}-worktree

Merge Conflicts

cd ../{agent}-worktree
git fetch origin main
git merge origin/main
# Resolve conflicts, then:
git add .
git commit -m "Merge main into {agent}-worktree"

Worktree Path Issues

# Remove and recreate
git worktree remove ../{agent}-worktree
git worktree add ../{agent}-worktree -b {agent}-worktree

Related Skills