Skills
.Work. You
Rest

worktree-resolve

Community

Merge swarm worktrees back into main cleanly.

Software Engineering#automation#git#workflow#worktree#merge#swarm#conflict-resolution
Authorjmylchreest
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Merge multiple swarm worktrees back into the main branch after testing to restore a clean, centralized repository state and prevent drift between branches.

Core Features & Use Cases

  • List and inspect active worktrees with git worktree list and metadata from .aide/state/worktrees.json.
  • Validate readiness (status: agent-complete) and perform dry-run merge checks before merging.
  • Resolve conflicts intelligently by combining changes and removing obsolete worktrees.
  • Cleanup: remove merged worktrees and prune state files to restore a single main workspace.

Quick Start

Run the worktree resolution workflow to merge all agent worktrees back into the main branch after swarm completion.

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: worktree-resolve
Download link: https://github.com/jmylchreest/aide/archive/main.zip#worktree-resolve

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.