Automates the intelligent merging and cleanup of git worktrees following multi-agent swarm completions.
The worktree-resolve skill is a specialized utility for the AIDE (Multi-agent orchestration) ecosystem that streamlines the transition from parallel AI development to a unified codebase. It systematically identifies completed task branches within git worktrees, executes mandatory validation suites like testing and linting, and performs intelligent merges into the main branch. Unlike standard automated merges, this skill employs a context-aware resolution strategy that analyzes conflicting code paths to preserve functional intent, ensuring that multi-agent contributions are integrated safely and cleanly without manual intervention for standard conflicts.
Key Features
01Detailed summary reporting of merge statuses and failure diagnostics
02Intelligent, context-aware git conflict resolution without destructive flags
034 GitHub stars
04Automated state tracking for multi-agent worktree lifecycles
05Comprehensive cleanup of temporary worktrees and merged feature branches
06Pre-merge validation including automated testing, linting, and build checks
Use Cases
01Managing complex git worktree lifecycles in automated multi-task coding workflows
02Consolidating parallel contributions from multiple AI agents into a single main branch
03Safely resolving architectural conflicts during large-scale feature integration
