Does this skill protect against accidental data loss?

Yes. The skill includes safety checks that refuse to remove worktrees with uncommitted changes or unmerged branches, and it never uses the 'force' delete flag for branches.

Where are the new worktree directories located?

Worktrees are created as sibling directories to your current repository root. This keeps your development environment organized and prevents nested repository issues.

Can I use this skill to resolve merge conflicts?

The skill identifies merge and rebase conflicts and prompts the user to resolve them manually before proceeding with the operation, ensuring a clean git history.

What is the advantage of using worktrees over git checkout?

Git worktrees allow you to have multiple branches checked out at the same time in different directories. This eliminates the need to stash or commit unfinished work just to switch context to another branch.

Git Worktree Manager

Name: Git Worktree Manager
Author: jimweller

byjimweller

0•

Developer Tools

Streamlines parallel branch development by managing Git worktrees as sibling directories for efficient multi-tasking.

The Git Worktree Manager skill empowers developers to handle multiple branches simultaneously without the overhead of constant stashing or context switching. It automates the lifecycle of git worktrees—including creation, listing, merging, and rebasing—while enforcing strict safety rules to prevent data loss. By calculating paths relative to the repository root and managing worktrees as sibling directories, it provides a clean, isolated environment for each feature or hotfix, making it an essential tool for high-velocity development workflows.

Key Features

01Protected worktree removal that prevents deletion of unmerged work

02Safe merge operations from feature branches into main with pre-check validation

03Context-aware rebasing onto latest origin/main

040 GitHub stars

05Automated sibling directory worktree creation with branch tracking

06Path calculation logic that avoids hardcoded directory structures

Use Cases

01Developing an urgent hotfix while keeping a large feature branch active and uncommitted

02Reviewing and testing a colleague's branch in a separate environment without disturbing your local changes

03Running long-duration test suites on one branch while continuing development on another

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jimweller/davit-dataops-dotfiles worktree

For use in Claude.ai and ChatGPT

Key Features

01Protected worktree removal that prevents deletion of unmerged work

02Safe merge operations from feature branches into main with pre-check validation

03Context-aware rebasing onto latest origin/main

040 GitHub stars

05Automated sibling directory worktree creation with branch tracking

06Path calculation logic that avoids hardcoded directory structures

Use Cases

01Developing an urgent hotfix while keeping a large feature branch active and uncommitted

02Reviewing and testing a colleague's branch in a separate environment without disturbing your local changes

03Running long-duration test suites on one branch while continuing development on another

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jimweller/davit-dataops-dotfiles worktree

For use in Claude.ai and ChatGPT