merge-worktree

Merge or cherry-pick Git worktree branch changes into the repository root.

1|Updated Jan 21, 2026

Search Tags:#git #branching #worktree #code integration #merge #conflict resolution

Ready to run

npx skills add https://github.com/ongspxm/mobot_skills --skill merge-worktree-ongspxm

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge-worktree
Source: https://github.com/ongspxm/mobot_skills/tree/main/merge-worktree
Command: npx skills add https://github.com/ongspxm/mobot_skills --skill merge-worktree-ongspxm

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill streamlines the process of merging changes from a Git worktree back into the main repository, ensuring a clean and controlled integration.

Core Features & Use Cases

Controlled Merging: Safely merges or cherry-picks changes from a worktree branch into the repository root.
Guided Workflow: Provides step-by-step instructions for rendering, executing, and verifying the merge process.
Conflict Resolution: Guides the user through line-by-line conflict resolution using apply_patch.
Use Case: After developing a feature in a separate worktree, use this Skill to integrate those changes back into your main development branch without manual Git command errors.

Quick Start

Execute the merge-worktree skill to integrate your current worktree changes into the repository root.

Frequently Asked Questions about merge-worktree

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

FAQPage Schema

How do I merge changes from a Git worktree back into the main repository?▼

Merging Git worktree changes involves integrating or cherry-picking commits from a worktree branch back into the repository root's default branch. This process uses Git commands for worktree operations, diffing, and merging to ensure clean code integration.

How do I resolve Git merge conflicts when integrating a worktree branch?▼

Resolving Git merge conflicts during worktree integration requires line-by-line conflict resolution. You can use the apply_patch tool to manually adjust conflicting code segments and successfully merge the worktree changes into the default branch.

What is the best way to integrate a feature branch from a separate worktree without manual Git errors?▼

The best way to integrate a feature branch from a separate worktree is using a guided workflow that renders and executes controlled merge or cherry-pick operations. This streamlines the process and prevents manual Git command errors during code integration.

Can I cherry-pick specific commits from a worktree branch into the repository root?▼

Yes, you can cherry-pick specific changes from a Git worktree branch into the repository root. This allows you to selectively integrate individual commits rather than merging the entire worktree branch history into the default branch.

When do I need to integrate a Git worktree branch into my default development branch?▼

You need to integrate a Git worktree branch when you have finished developing a feature in a separate worktree and want to bring those changes back into your main development branch. This ensures controlled merging and a clean repository history.