merge-tracks

Merge parallel development tracks into a main branch with Git worktrees.

17|8|Updated Oct 30, 2025
One-click install
npx skills add https://github.com/michael-harris/devteam --skill merge-tracks
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge-tracks
Source: https://github.com/michael-harris/devteam/tree/main/skills/merge-tracks
Command: npx skills add https://github.com/michael-harris/devteam --skill merge-tracks

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill provides a robust mechanism to manually merge parallel development tracks back into a main branch, offering fine-grained control over the process when automatic merging is insufficient.

Core Features & Use Cases

  • Manual Track Merging: Allows developers to take control of merging completed development tracks.
  • Conflict Resolution Assistance: Provides guidance and prepares for intelligent conflict resolution.
  • Worktree and Branch Management: Offers options to keep or delete worktrees and branches post-merge.
  • Use Case: After several parallel feature development tracks are completed, use this Skill to systematically merge them into the main branch, ensuring all code is integrated correctly and conflicts are managed.

Quick Start

Manually merge all completed development tracks back into the main branch.

Frequently Asked Questions about merge-tracks

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

FAQPage Schema
How do I merge parallel development tracks back into a main branch?

Merging parallel development tracks involves manually integrating completed feature branches back into the main branch using a dedicated track-merger agent, which supports Git worktrees and provides configurable cleanup options for branches and worktrees.

When do I need manual conflict resolution for Git worktrees?

Manual conflict resolution for Git worktrees is needed during complex integration scenarios requiring developer oversight. This Skill prepares for intelligent conflict resolution when merging parallel development tracks that cannot be automatically integrated.

Can I keep or delete Git worktrees and branches after a merge?

Yes, you can configure cleanup options to either keep or delete Git worktrees and branches post-merge. This allows you to manage your development environment according to your project's ongoing integration needs.

What is the best way to manage state persistence during complex code integration?

Managing state persistence during complex code integration is handled via SQLite. This ensures your manual merge operations and development track states are reliably stored and tracked throughout the integration process.

Does this approach work for integrating multiple parallel feature tracks simultaneously?

Yes, it is designed for systematically merging several completed parallel feature development tracks into the main branch. It ensures all code is integrated correctly while managing conflicts across multiple tracks.