Is it compatible with multiple source branches at once?

Yes, you can orchestrate a multi-source merge, pulling different files from various active worktrees into your current branch in one workflow.

Can I use this for interactive patching?

Yes, it supports interactive patch selection, letting you choose exactly which lines of code to apply from a source worktree through a guided interface.

Does it handle merge conflicts?

Absolutely; the skill guides you through identifying, resolving, and staging conflicted files before finalizing the merge commit.

How does this differ from a standard git merge?

This skill allows for selective, granular merging of specific files or code hunks from different worktrees, whereas a standard merge applies the entire branch history.

Will it help me clean up my worktrees after merging?

Yes, after a successful merge, the skill automatically prompts you to remove unnecessary worktrees to keep your local repository organized.

Git Merge Worktree

Name: Git Merge Worktree
Author: NeoLabHQ

byNeoLabHQ

•

542

•

Developer Tools

Streamlines merging changes from multiple git worktrees using selective checkouts, interactive patching, and guided cherry-picking strategies.

This skill provides a specialized interface for Claude to manage complex git merge operations between different worktrees. It allows developers to selectively bring in changes—ranging from entire directories to specific code hunks—without requiring a full branch merge. It is particularly useful for developers managing multiple features simultaneously, enabling them to cherry-pick fixes or UI components from one environment to another with interactive conflict resolution and cleanup automation.

Key Features

01Interactive patch selection to merge specific code hunks using git's patch mode

02Support for merging from multiple source worktrees into a single coherent commit

03Automated post-merge cleanup suggestions to maintain a tidy local environment

04Selective file and directory checkout from any active git worktree

05Guided cherry-picking with selective staging for granular commit integration

06542 GitHub stars

Use Cases

01Selectively applying only relevant parts of a large commit via interactive patching

02Pulling a specific bug fix from a hotfix worktree into a feature branch without a full merge

03Combining UI components from several experimental worktrees into a main development branch

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add neolabhq/context-engineering-kit merge-worktree

For use in Claude.ai and ChatGPT

Download Skill