# Worktrees

> Git worktree management for isolated task development Use when this capability is needed.

- Skill: `tomevault-io/worktrees-2` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add tomevault-io/worktrees-2`
- Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/worktrees-2/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Productivity
- Author: tomevault-io (https://skillmd.com/u/tomevault-io)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/tomevault-io/worktrees-2

---


# Worktrees

Guide for managing git worktrees in pokayokay.

## When Worktrees Are Created

| Task Type | Default | Override |
|-----------|---------|----------|
| feature | Worktree | --in-place |
| bug | Worktree | --in-place |
| spike | Worktree | --in-place |
| chore | In-place | --worktree |
| docs | In-place | --worktree |
| test | Inherits | explicit flag |

## Key Principles

- **Story-based reuse** — Tasks in the same story share a worktree for related changes
- **Auto dependency install** — Dependencies install automatically on worktree creation
- **Clean completion** — Choose merge, PR, keep, or discard when done
- **Isolation** — All worktrees live in `.worktrees/` (auto-ignored by git)

## Quick Start Checklist

1. Task type determines worktree vs in-place (see table above)
2. Story worktrees are reused across related tasks
3. Dependencies auto-install based on detected lockfiles
4. On completion: merge to main, create PR, keep, or discard
5. Troubleshoot with `git worktree list` if issues arise

## References

| Reference | Description |
|-----------|-------------|
| [worktree-management.md](references/worktree-management.md) | Lifecycle, completion options, dependency install, troubleshooting |
| [cleanup-strategies.md](references/cleanup-strategies.md) | Cleanup criteria, detection, disk management, scheduled cleanup |
| [parallel-worktrees.md](references/parallel-worktrees.md) | Parallel execution worktree isolation, conflict prevention |

---
> Converted and distributed by [TomeVault](https://tomevault.io/claim/srstomp) — claim your Tome and manage your conversions.
<!-- tomevault:4.0:skill_md:2026-04-13 -->

