worktree-merge

Merge worktree branches into the main branch with context gathering and conflict resolution.

56|12|Updated Apr 26, 2026

Search Tags:#git #version control #worktree #branch management #merge

Ready to run

npx skills add https://github.com/Neuron-Mr-White/UniPi --skill worktree-merge-neuron-mr-white

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: worktree-merge
Source: https://github.com/Neuron-Mr-White/UniPi/tree/main/packages/workflow/skills/worktree-merge
Command: npx skills add https://github.com/Neuron-Mr-White/UniPi --skill worktree-merge-neuron-mr-white

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill automates the process of merging worktree branches back into the main branch, ensuring that the merge is done with proper context and minimal conflicts.

Core Features & Use Cases

Contextual Merging: Gather context from specs and plans before merging to prevent conflicts.
Branch Management: Identify and merge specific branches, either manually or through arguments.
Conflict Resolution: Guided conflict resolution with structured steps and user prompts.
Cleanup: Remove worktrees and branches after successful merges to keep the repository clean.

Quick Start

Run the command to merge all completed worktree branches into the main branch: /unipi:worktree-merge

Frequently Asked Questions about worktree-merge

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

FAQPage Schema

How do I merge a git worktree branch back into the main branch?▼

To merge a git worktree branch into the main branch, automate the process with context gathering and guided conflict resolution. This ensures feature branches integrate with proper documentation and minimal conflicts.

What is the best way to prevent conflicts when merging version control branches?▼

The best way to prevent conflicts when merging version control branches is contextual merging, which gathers context from specs and plans beforehand. This approach identifies potential issues early to ensure minimal conflicts.

How do I clean up git worktrees and branches after a successful merge?▼

To clean up git worktrees and branches after a successful merge, use automated cleanup features that remove both the worktree and the branch. This keeps your repository clean and free of obsolete feature branches.

Can I merge specific git branches instead of all completed worktree branches at once?▼

Yes, you can merge specific git branches by identifying and selecting them either manually or through arguments. This allows targeted branch management rather than forcing a bulk merge of all completed worktrees.

Does guided conflict resolution work for git worktree merges?▼

Yes, guided conflict resolution works for git worktree merges by providing structured steps and user prompts. This helps systematically resolve merge conflicts when integrating feature branches back into the main branch.

Do I need git installed to automate worktree branch management and merging?▼

Yes, you need git installed to automate worktree branch management and merging. The git version control system is a required dependency for identifying branches, merging, and cleaning up worktrees.