worktree-merge

Merge parallel worktree branches into main with conflict detection and verification.

Updated Aug 23, 2026
One-click install
npx skills add https://github.com/mariasebarespersona/Tum-AI --skill worktree-merge-mariasebarespersona
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: worktree-merge
Source: https://github.com/mariasebarespersona/Tum-AI/tree/main/.claude/skills/worktree-merge
Command: npx skills add https://github.com/mariasebarespersona/Tum-AI --skill worktree-merge-mariasebarespersona

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

When agents run with isolation: "worktree", each creates a separate branch that can modify the same files, leading to merge conflicts or lost work if not coordinated.

Core Features & Use Cases

  • Inventory pending worktree branches and active worktrees
  • Detect conflicts before merging with test-merge
  • Determine safe merge order to minimize conflicts
  • Merge branches into main with traceable merge messages
  • Verify builds and tests after each merge
  • Generate a merged report for stakeholders

Quick Start

Follow the protocol to inventory pending worktree branches, detect conflicts, determine merge order, and merge each branch into main while verifying builds after each step.

Frequently Asked Questions about worktree-merge

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

FAQPage Schema
How do I merge parallel git worktree branches back to main without conflicts?

Merge parallel git worktree branches back to main by inventorying pending branches, detecting conflicts with test-merges, determining a safe merge order, and verifying builds after each per-branch merge.

What is the best way to detect conflicts before merging worktree branches?

Detect conflicts before merging worktree branches by running a test-merge phase that analyzes active worktrees and pending branches to determine a safe merge order, preventing lost work from overlapping file modifications.

How do I manage parallel agent work in separate worktrees?

Manage parallel agent work in separate worktrees by using isolation workflows, then coordinating the merge back to main through conflict detection, ordered merges, and post-merge build verification.

Can I verify builds after each worktree branch merge?

Verify builds after each worktree branch merge by running post-merge verification steps that check build stability and test suite results before proceeding to merge the next pending branch.

Why does merging parallel worktree branches cause lost work?

Merging parallel worktree branches causes lost work when agents modify the same files in separate isolated branches without coordination, leading to unresolvable merge conflicts when integrating back to main.

Does worktree-merge work with isolation branches from parallel tasks?

Yes, worktree-merge is designed specifically for isolation branches created by parallel tasks, providing inventory, conflict detection, ordered merging, and post-merge build verification to safely integrate changes back to main.