git:merge-worktree

Merge changes from git worktrees into the current branch.

Updated Mar 4, 2026
One-click install
npx skills add https://github.com/dalawwa/labor-methods --skill git-merge-worktree
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git:merge-worktree
Source: https://github.com/dalawwa/labor-methods/tree/main/.cek/plugins/git/skills/merge-worktree
Command: npx skills add https://github.com/dalawwa/labor-methods --skill git-merge-worktree

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps developers merge changes from git worktrees into the current branch with fine-grained control, enabling selective file checkout, interactive patch application, cherry-picking of commits, or full-branch merges.

Core Features & Use Cases

  • Selective File Checkout: merge specific files or directories from another worktree or branch.
  • Interactive Patch Selection: apply only selected hunks from changes.
  • Cherry-Pick with Selective Staging: cherry-pick commits and exclude some changes.
  • Manual Merge with Conflict Handling: perform a full merge with controlled resolution.
  • Multi-Source Merges: combine files from multiple worktrees/branches.

Quick Start

Invoke the skill to merge selected files or commits from a source worktree into the current branch using the chosen strategy.

Frequently Asked Questions about git:merge-worktree

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How does manual merge handle conflicts when bringing changes from a worktree?

Manual merge handles conflicts by guiding you through a controlled resolution process when bringing changes from a worktree. It performs a full merge and prompts you to resolve any conflicts directly, ensuring you maintain precise control over the final state.

How do I merge specific files from a git worktree into my current branch?

To merge specific files from a git worktree into your current branch, you can use the selective file checkout strategy. This allows you to choose exact files or directories from another worktree or branch without performing a full merge.

Can I cherry-pick a commit from a worktree but exclude some of the changes?

Yes, you can cherry-pick a commit from a worktree and exclude specific changes using the cherry-pick with selective staging strategy. This performs a single-commit cherry-pick while letting you control exactly which modifications are staged.

What is the best way to apply only selected hunks from git worktree changes?

The best way to apply only selected hunks from git worktree changes is through interactive patch selection. This strategy applies only the specific code hunks you choose, giving you precise control over the merged output.

Can I combine files from multiple git worktrees into one branch?

Yes, you can combine files from multiple git worktrees into one branch using the multi-source merge feature. This allows you to selectively checkout and merge files from several different worktrees or branches simultaneously.

How does manual merge handle conflicts when bringing changes from a worktree?

Manual merge handles conflicts by guiding you through a controlled resolution process when bringing changes from a worktree. It performs a full merge and prompts you to resolve any conflicts directly, ensuring you maintain precise control over the final state.