skills.rest
Gamezar
GamezarCOMMUNITY
Explore all skills by this author →
GitHub

git-merge-worktree

Merge Git worktree changes into the current branch with configurable strategies.

Updated Mar 10, 2026
Search Tags:#git#collaboration#version control#worktree#code integration#merge
One-click install
npx skills add https://github.com/Gamezar/opencode-cek --skill git-merge-worktree-gamezar
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-merge-worktree
Source: https://github.com/Gamezar/opencode-cek/tree/main/plugins/git/skills/git-merge-worktree
Command: npx skills add https://github.com/Gamezar/opencode-cek --skill git-merge-worktree-gamezar

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps users merge changes from Git worktrees into their current branch, offering flexible strategies for different merging needs.

Core Features & Use Cases

  • Selective File Merging: Merge specific files or directories from another worktree.
  • Interactive Patching: Choose which hunks (parts of changes) to apply from a file.
  • Cherry-Picking: Apply specific commits, with options to stage only desired changes.
  • Full Branch Merging: Perform a complete merge with manual conflict resolution.
  • Use Case: You've made changes in a feature worktree and want to bring only a few specific files into your main branch without a full merge, or you need to selectively apply a bug fix commit.

Quick Start

Use the git-merge-worktree skill to interactively merge changes from the 'feature-branch' worktree into your current branch.

Frequently Asked Questions about git-merge-worktree

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

FAQPage Schema
How do I merge specific files from a Git worktree into my current branch?▼

To merge specific files from a Git worktree, use selective file checkout to bring only chosen files or directories into your current branch without performing a full merge. This targets individual file changes directly.

Can I interactively choose which parts of a file to apply from another worktree?▼

Yes, interactive patch selection lets you choose specific hunks from a file to apply when merging a Git worktree. This granular control applies only the desired code changes rather than the entire file.

What's the best way to cherry-pick specific commits across Git worktrees?▼

The best way to cherry-pick commits across Git worktrees is using selective staging during the cherry-pick process. This applies specific commits while letting you stage only the desired changes from them.

How do I handle merge conflicts when integrating a full branch from a worktree?▼

Handle merge conflicts during worktree integration by performing a full branch merge with manual conflict resolution. This guides you through resolving discrepancies to finalize the code integration.

Can I merge changes from multiple Git worktrees at the same time?▼

Yes, multi-worktree merges are supported, allowing you to consolidate changes from multiple Git worktrees concurrently. This integrates separate branches into your current branch.

Does Git worktree merging provide cleanup options after integration?▼

Yes, Git worktree merging provides post-merge cleanup prompts. These prompts offer to tidy up your workspace after completing the code integration, keeping your repository organized.

Related Skills

Explore More Software Engineering Skills→
IAmKongHaiIAmKongHai

ce-clean-gone-branches

Remove local branches and worktrees deleted from the remote repository.

Community
Basic
ReinaMacCredyReinaMacCredy
223

finishing-a-development-branch

Verify tests and present merge, PR, or cleanup options for a development branch.

Community
Advanced
X-School-AcademyX-School-Academy
19

dev-swarm-git-merge

Merge specific files or directories and squash commits across Git branches.

Official
Intermediate
dalawwadalawwa

git:merge-worktree

Merge changes from git worktrees into the current branch.

Community
Advanced