Skills
.Work. You
Rest

do:merge

Community

Retry unmerged worktree merges

Software Engineering#automation#git#worktree#merge#conflict resolution#session recovery
Authoradamfeldman
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps resolve issues where a worktree merge into the main branch failed, allowing you to retry the merge process and clean up unmerged branches.

Core Features & Use Cases

  • Automated Merge Detection: Identifies unmerged Git worktrees associated with your session.
  • Intelligent Branch Selection: Automatically selects the branch to merge if only one is found, or prompts you for selection if multiple exist.
  • Conflict Resolution Assistance: Provides options to handle merge conflicts, including automatic resolution for additive changes and user-guided review.
  • Use Case: After a session compaction, you find that a worktree merge to main didn't complete due to conflicts. Running /do:merge will help you resolve these conflicts and finalize the merge.

Quick Start

Run the do:merge skill to merge any unmerged worktree branches into main.

Dependency Matrix

Required Modules

None required

Components

scripts

💻 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: do:merge
Download link: https://github.com/adamfeldman/compound-workflows/archive/main.zip#do-merge

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.