using-git-worktrees

Solid

Use Git worktrees to create parallel working directories safely; avoid branch-switch contamination.

AI & Automation 103 stars 25 forks Updated today MIT

Install

View on GitHub

Quality Score: 85/100

Stars 20%
67
Recency 20%
100
Frontmatter 20%
70
Documentation 15%
100
Issue Health 10%
50
License 10%
100
Description 5%
100

Skill Content

# Using Git Worktrees ## Overview Git worktree allows mounting multiple working directories onto the same repository simultaneously, each mapped to a different branch. This is ideal for parallel development and hotfixes. ## Workspace Selection Principles - Manage them centrally outside the repo or in a dedicated folder (e.g., `../wt-<task>`). - Name them with task semantics (feature/hotfix + short name). - Avoid confusing or overwriting existing workspaces. ## Safety Checks 1. **Detect nesting first** — do not create a worktree from inside another worktree or a submodule: - You are already in a *linked* worktree if `git rev-parse --git-dir` differs from `git rev-parse --git-common-dir` (they match in the main worktree). `cd` to the main worktree before adding. - You are in a submodule if `git rev-parse --show-superproject-working-tree` is non-empty. Operate on the intended repo, not the submodule. 2. Ensure the primary workspace is clean (prevent taking uncommitted changes). 3. List existing worktrees first: `git worktree list`. 4. Check that the target directory does not exist or is empty. 5. **Keep the worktree path out of the tracked tree** — prefer a sibling dir (`../wt-<task>`). If it must live inside the repo, verify it is ignored first: `git check-ignore -q <path>` (exit 0 = ignored). A non-ignored in-repo worktree pollutes the parent's `git status` and can be committed by accident. 6. Confirm branch naming and tracking strategies. ## Setup Workflow 1. Cr...

Details

Author
KbWen
Repository
KbWen/agentic-os
Created
3 months ago
Last Updated
today
Language
Python
License
MIT

Similar Skills

Semantically similar based on skill content — not just same category