Does this skill work if I am already in the main working tree?

The skill is specifically designed for worktree management; it will identify if you are in the main tree and abort the process if there is no worktree to merge or clean up.

Can I merge into a branch other than 'main'?

Yes, you can provide a specific target branch as an argument. If no argument is provided, the skill defaults to 'main'.

What happens if there are merge conflicts during the process?

The skill will detect the conflict, report the exact path of the main worktree where the conflict occurred, and abort the process so you can resolve it manually.

Will this skill delete my work if I haven't committed yet?

No, the skill includes a safety check that runs 'git status --porcelain' and will abort the merge if any uncommitted changes are detected.

Git Worktree Merge

Name: Git Worktree Merge
Author: tomzhengy

bytomzhengy

•

Herramientas para Desarrolladores

Automates the process of merging git worktree branches back into target branches while performing environment cleanup.

The Git Worktree Merge skill streamlines complex git workflows by managing the transition from isolated worktrees back to the primary repository. It automatically detects if you are working within a worktree, validates the environment for uncommitted changes to prevent data loss, and executes a merge into your target branch (defaulting to main). Once the merge is successful, the skill handles the manual overhead of removing the worktree directory and verifying the cleanup, allowing developers to switch tasks seamlessly without manual file management.

Características Principales

01Automated removal and cleanup of worktree directories

02Automated path switching between worktrees and main repository

03Safety checks for uncommitted changes before merging

04Merge conflict detection and detailed error reporting

053 GitHub stars

06Automatic worktree environment verification

Casos de Uso

01Automating the cleanup of temporary git worktrees after finishing a task.

02Ensuring a clean repository state when moving from sub-directory work to primary development.

03Merging feature branches developed in isolated worktrees back to the main branch.

Características Principales

01Automated removal and cleanup of worktree directories

02Automated path switching between worktrees and main repository

03Safety checks for uncommitted changes before merging

04Merge conflict detection and detailed error reporting

053 GitHub stars

06Automatic worktree environment verification

Casos de Uso

01Automating the cleanup of temporary git worktrees after finishing a task.

02Ensuring a clean repository state when moving from sub-directory work to primary development.

03Merging feature branches developed in isolated worktrees back to the main branch.