Can I merge Pull Requests directly from a worktree?

It is best practice to merge from the main repository. Git's rebase-merge functionality often needs to check out the target branch (like main), which is usually already locked by the main repository checkout.

Why does this skill recommend a specific directory structure?

By keeping worktrees in a dedicated subfolder like '_worktrees/', you keep your main repository clean and make it easier to manage, ignore in global search, and automate cleanup processes.

What is the 'CWD trap' mentioned in the documentation?

The CWD (Current Working Directory) trap occurs when you delete a worktree directory while your terminal is still inside it. This can permanently break the shell session. This skill provides safe removal patterns to avoid this.

What is the benefit of using Git worktrees over standard branching?

Git worktrees allow you to have multiple branches checked out in separate directories simultaneously. This eliminates the need to stash or commit incomplete work just to switch contexts, making parallel development significantly faster.

Git Worktree Workflow

Name: Git Worktree Workflow
Author: flox

byflox

•

開発者ツール

Manages parallel development streams using structured Git worktrees and ephemeral branch patterns to eliminate context-switching friction.

The Git Worktree Workflow skill implements a robust methodology for handling multiple features, tickets, or 'slices' simultaneously within the Forge engineering framework. By organizing parallel development into a dedicated subfolder and enforcing ephemeral branch patterns, it eliminates the need for frequent branch switching and complex git reset cycles. The skill provides specific guidance on naming conventions, safe navigation via absolute paths, and critical procedures for merging and cleanup to avoid common pitfalls like the 'CWD trap' that can break terminal sessions.

主な機能

01Optimized navigation strategies using absolute paths and root-first movement

021 GitHub stars

03Ephemeral branch lifecycle management to ensure clean, single-use PR streams

04Context-aware naming conventions for slices, efforts, and implementation tickets

05Standardized directory structure organizing all worktrees within a central folder

06Safe worktree removal protocols to prevent shell session corruption

ユースケース

01Implementing the Forge 'slice' and 'effort' engineering patterns for complex requirements

02Developing multiple high-priority features or bug fixes in parallel without stashing changes

03Maintaining a clean main repository state while experimenting with various implementation approaches

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add flox/forge-plugin worktree-workflow

For use in Claude.ai and ChatGPT

主な機能

01Optimized navigation strategies using absolute paths and root-first movement

021 GitHub stars

03Ephemeral branch lifecycle management to ensure clean, single-use PR streams

04Context-aware naming conventions for slices, efforts, and implementation tickets

05Standardized directory structure organizing all worktrees within a central folder

06Safe worktree removal protocols to prevent shell session corruption

ユースケース

01Implementing the Forge 'slice' and 'effort' engineering patterns for complex requirements

02Developing multiple high-priority features or bug fixes in parallel without stashing changes

03Maintaining a clean main repository state while experimenting with various implementation approaches