Claude
Skills
Sign in
Back

worktrees

Included with Lifetime
$97 forever

Git worktree management for isolated task development

Productivity

What this skill does


# 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** — Use `finishing-branch` to choose merge, PR, keep, or discard with verification evidence
- **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: use `finishing-branch` to verify and choose merge, 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 |

Related in Productivity