Skills
.Work. You
Rest

cat:merge-subagent

Community

Merge subagents into tasks with clean resolution.

Software Engineering#git#worktree#merge#subagent#conflict-resolution#branch-management
Authorcowwoc
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This skill automates the consolidation of a completed subagent's work into the parent task branch, ensuring a clean, auditable merge and proper cleanup.

Core Features & Use Cases

  • Automated merge orchestration: Integrates a completed subagent's changes into the main task branch with conflict resolution and cleanup.
  • Safe cleanup: Removes subagent branches and worktrees after a successful merge and updates the STATE.md accordingly.
  • State synchronization: Keeps merged status and related metadata in sync for auditability.

Quick Start

Ensure SUBAGENT_BRANCH and TASK_BRANCH exist and are up to date. Then run the merge-subagent workflow to merge the subagent into the task branch, resolve conflicts if needed, delete the subagent branch, and clean up the worktree. The workflow will update STATE.md accordingly.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: cat:merge-subagent
Download link: https://github.com/cowwoc/cat/archive/main.zip#cat-merge-subagent

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.