Automates the integration of subagent work into parent branches with conflict resolution and workspace cleanup.
This skill facilitates the final stage of a subagent's lifecycle within the Claude Code Cat ecosystem by streamlining the process of merging specialized subagent branches back into the main task flow. It ensures code integrity through robust conflict resolution strategies and automates critical cleanup tasks like worktree removal and branch deletion. By maintaining a clear audit trail in the project's tracking state, it prevents fragmented workflows and technical debt while allowing for safe, concurrent execution across complex agentic tasks.
Key Features
01Concurrent execution safety via task lock heartbeats
02Specialized handling for code, config, and metadata files
03Post-merge workspace cleanup including worktree and branch removal
04Automated Git merge with intelligent conflict resolution
05Comprehensive state tracking and audit logging in STATE.md
062 GitHub stars
Use Cases
01Consolidating sub-task results like parser implementations into a feature branch
02Automating the cleanup of temporary development environments after sub-task completion
03Resolving version conflicts between multiple parallel AI subagents
