Does this skill delete my work?

It only deletes temporary subagent branches and worktrees after a successful merge or when results have been preserved, ensuring your primary task progress is safe.

Can I use this for multiple subagents at once?

Yes, the skill is designed to handle multiple subagents by merging them in dependency order and cleaning up their respective environments sequentially.

What happens if there are merge conflicts?

The skill provides specific strategies for different file types, such as preferring subagent versions for fresh code context while requiring manual merges for configuration files.

Why is the task-lock heartbeat necessary?

The heartbeat ensures that long-running merge or validation operations do not lose their execution lock, preventing other agents from interfering with the git state.

Subagent Branch Merger

Name: Subagent Branch Merger
Author: cowwoc

bycowwoc

•

Productivity & Workflow

Integrates subagent contributions into parent task branches with automated conflict resolution and environment cleanup.

The Merge Subagent skill streamlines the final phase of multi-agent workflows by consolidating code from subagent branches back into the primary task branch. It automates the git merge process, provides specialized conflict resolution strategies for different file types, and ensures repository hygiene by automatically deleting ephemeral branches and removing associated git worktrees. By updating the project's state tracking metadata, it provides a seamless transition from specialized sub-tasks back to the main development flow while maintaining a clean, linear history.

Key Features

01Comprehensive cleanup of subagent branches and git worktrees

02Real-time STATE.md updates for task lifecycle tracking

03Post-merge validation and compilation checks

04Automated git merge with customizable conflict resolution strategies

05Concurrent execution safety using task-lock heartbeats

0656 GitHub stars

Use Cases

01Consolidating completed sub-tasks into a parent feature branch

02Resolving merge conflicts between parallel AI agent contributions

03Automating repository hygiene after complex code generation tasks

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cowwoc/cat merge-subagent

For use in Claude.ai and ChatGPT

Download Skill