skills.rest
cowwoc
cowwocCOMMUNITY
Explore all skills by this author →
GitHub

cat:merge-subagent

Merge a completed subagent branch into the parent task branch with cleanup.

101|2|Updated Jan 7, 2026
Search Tags:#git#worktree#merge#subagent#conflict-resolution#branch-management
One-click install
npx skills add https://github.com/cowwoc/cat --skill cat-merge-subagent
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: cat:merge-subagent
Source: https://github.com/cowwoc/cat/tree/main/plugin/skills/merge-subagent
Command: npx skills add https://github.com/cowwoc/cat --skill cat-merge-subagent

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about cat:merge-subagent

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

FAQPage Schema
How do I merge a subagent's work into a parent task branch in Git?▼

Merging a subagent's work into a parent task branch requires automating the consolidation of completed changes, handling conflict resolution, cleaning up worktrees, and updating state metadata for auditable tracking.

What is the best way to clean up Git worktrees after merging a subagent branch?▼

Cleaning up Git worktrees after a subagent merge involves safely removing the subagent branch and its associated worktree directory following a successful integration, then updating the tracking state file.

How does state synchronization work after merging a Git subagent?▼

State synchronization after a Git subagent merge updates the STATE.md file to reflect the merged status and related metadata, ensuring the branch integration process remains fully auditable.

Can I automate conflict resolution when consolidating Git subagent branches?▼

Automating conflict resolution during subagent branch consolidation is supported by standard Git tooling, ensuring deterministic integration of subagent contributions into the parent task branch.

What do I need to set up before merging a subagent branch into a task branch?▼

Before merging a subagent branch, you must ensure both the SUBAGENT_BRANCH and TASK_BRANCH exist in Git, are up to date, and operate within a clean workspace to prevent destructive side effects.

When should I avoid automated subagent merge workflows?▼

You should avoid automated subagent merge workflows if your Git workspace is not clean or if your project lacks standard Git tooling for branching, merging, and worktree cleanup.

Related Skills

Explore More Software Engineering Skills→
AllBeingsFutureAllBeingsFuture
9

obra/superpowers@using-git-worktrees

Create isolated git worktrees with verified .gitignore and dependency setup.

Community
Advanced
smykla-skalskismykla-skalski
3

clean-gone

Removes stale Git branches and associated worktrees automatically.

Official
Intermediate
LuminairPrimeLuminairPrime

pull

Synchronize a local branch with origin/main and resolve merge conflicts.

Community
Intermediate
aaronbassettaaronbassett
4

worktrees:orchestrator

Coordinate parallel development across subagents using isolated git worktrees.

Community
Intermediate