What is a git worktree?

A git worktree allows you to have multiple branches checked out simultaneously in different directories within the same repository, enabling parallel development without switching branches in a single directory.

How does this skill handle open Pull Requests?

The skill checks PR status via the GitHub CLI and will block the merge process if it detects an open, non-draft PR, preventing accidental integration of code still under review.

Does this skill work with VS Code?

Yes, it specifically includes features to update VS Code .code-workspace files, removing the worktree folder from your sidebar automatically after the merge is complete.

What merge strategies can I use?

The skill supports multiple git merge strategies including fast-forward (ff), squash merges, and cherry-picking, which can be specified via the --strategy flag.

Can I see what will happen before running the merge?

Yes, you can use the --dry-run flag to preview all planned actions, including PR checks, sync commands, and workspace deletions, without making any actual changes.

Worktree Merge & Cleanup

Name: Worktree Merge & Cleanup
Author: manifoldlogic

bymanifoldlogic

0•

Developer Tools

Automates the git worktree merge process including PR verification, branch synchronization, and VS Code workspace cleanup.

The worktree-merge skill provides a robust, safety-first workflow for integrating feature worktrees back into a primary branch within a development environment. It streamlines the integration process by verifying Pull Request status to prevent premature merges, ensuring the base branch is synced with origin to minimize conflicts, and automatically removing the worktree from VS Code workspace files post-merge. This end-to-end automation ensures a clean development environment and prevents the accumulation of orphaned directories and stale configurations in complex project structures.

Key Features

01Base Branch Synchronization: Automatically syncs the main branch with origin before merging to reduce conflict risk.

020 GitHub stars

03Intelligent Auto-detection: Automatically resolves repository and worktree names from the current working directory path.

04Automated Environment Cleanup: Removes worktree folders from VS Code workspace files and local directories post-merge.

05PR Status Verification: Blocks merges if a Pull Request is still open or in a non-draft state.

06Dry-Run Mode: Preview all planned git operations and workspace modifications without executing changes.

Use Cases

01Automating the teardown of temporary development environments after code review and integration.

02Safely merging worktree code while ensuring the local primary branch is up-to-date with remote changes.

03Integrating a completed feature branch and cleaning up the devcontainer workspace in a single command.

Key Features

01Base Branch Synchronization: Automatically syncs the main branch with origin before merging to reduce conflict risk.

020 GitHub stars

03Intelligent Auto-detection: Automatically resolves repository and worktree names from the current working directory path.

04Automated Environment Cleanup: Removes worktree folders from VS Code workspace files and local directories post-merge.

05PR Status Verification: Blocks merges if a Pull Request is still open or in a non-draft state.

06Dry-Run Mode: Preview all planned git operations and workspace modifications without executing changes.

Use Cases

01Automating the teardown of temporary development environments after code review and integration.

02Safely merging worktree code while ensuring the local primary branch is up-to-date with remote changes.

03Integrating a completed feature branch and cleaning up the devcontainer workspace in a single command.