Does this skill handle merge conflicts?

Yes, during merge or rebase operations, the skill identifies conflicts and provides guidance to resolve them manually before allowing the operation to proceed or push to the remote.

How does the skill handle environment variables?

After creating a new worktree, the skill prompts the user to run a secrets command to copy essential configuration files like .envrc and GPG keys to the new directory.

What is the benefit of using Git worktrees over branch switching?

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 contexts for a quick fix or code review.

Is it safe to delete worktrees using this skill?

Absolutely. The skill includes built-in safety rules that verify if a branch is fully merged into main before allowing removal, preventing accidental loss of work.

Git Worktree Manager

Name: Git Worktree Manager
Author: jimweller

byjimweller

0•

개발자 도구

Manages Git worktrees to enable seamless parallel branch development and isolated workspace management.

The Git Worktree Manager skill streamlines the process of working on multiple branches simultaneously by automating the creation, listing, merging, and removal of Git worktrees. Instead of constantly switching branches in a single directory, this skill helps you maintain separate, isolated environments for different tasks, ensuring that paths are correctly calculated from the repository root and safety checks are enforced to prevent data loss or improper branch deletion.

주요 기능

01Automated creation of sibling worktree directories with new branches

02One-command rebasing of active worktrees onto the latest main branch

030 GitHub stars

04Integrated safety checks to prevent deletion of unmerged work

05Safe merging of feature worktrees into the main branch with conflict detection

06Streamlined environment setup reminders for .envrc and GPG keys

사용 사례

01Fixing an urgent production bug in a separate directory without stashing current feature progress

02Reviewing and testing a colleague's pull request in an isolated environment

03Managing multiple long-running feature branches that require frequent context switching

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

Download Skill