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 the story worktree (tasks in the same story share it) |
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
- Task type determines worktree vs in-place (see table above)
- Story worktrees are reused across related tasks
- Dependencies auto-install based on detected lockfiles
- On completion: use
finishing-branch to verify and choose merge, PR, keep, or discard
- Troubleshoot with
git worktree list if issues arise
When NOT to Use
- Starting a work session — Use
work-session; worktree creation happens automatically during /work
- Using git worktrees outside pokayokay — This skill is pokayokay-specific; for general git worktrees use git directly
References
