git-worktree-workflow

Git worktrees enable parallel feature development by isolating separate story branches into distinct working directories, allowing you to manage multiple user stories simultaneously without context switching. This skill automates that worktree creation and lifecycle.

You can sync a git worktree with the main branch by running a dedicated sync script that updates the base branch via either a merge or rebase operation. This deterministic syncing ensures your isolated story branch stays current with the shared repository.

The best way to manage multiple concurrent user stories is using a one-worktree-per-story approach. It provides clean isolation for each branch and automates the lifecycle from creation and syncing to conflict detection, merge readiness validation, and final cleanup.

You can detect conflicts in a git worktree by running a validation script that checks readiness to merge. This automated process identifies conflicts during the syncing phase, ensuring issues are resolved in the isolated worktree before integrating into the shared repository.

You can clean up git worktrees and branches after merging by running a dedicated merge and cleanup script. This removes the completed worktree directory and deletes the associated story branch, maintaining a clutter-free repository environment.