catlog22

Maestro Merge — Git skill for Claude Code

Git community

Merge session worktree branch back to main.

How to install Maestro Merge

Installs to ~/.claude/commands/catlog22-maestro-flow-maestro-merge.md

Terminal
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/catlog22/Maestro-Flow/HEAD/.claude/commands/maestro-merge.md -o ~/.claude/commands/catlog22-maestro-flow-maestro-merge.md

Restart Claude Code, or start a new session, for it to be picked up.

What Maestro Merge does

name: maestro-merge disable-model-invocation: true description: Merge session worktree branch back to main argument-hint: "--session [--force] [--dry-run] [--no-cleanup] [--continue]" allowed-tools:

  • Read
  • Write
  • Edit
  • Bash
  • Glob
  • Grep
  • Agent
  • AskUserQuestion session-mode: run contract: discovery: self-described consumes: [] produces: []
@~/.maestro/workflows/run-mode.md Merge a session worktree

Alternatives in Git

  • Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
  • OSS PR — Commit + PR workflow for open source contributions: auto-creates a user-prefixed branch when on main/master, t 19.7k ★
  • Local Review — You are tasked with setting up a local review environment for a colleague's branch 10k ★

Full documentation available on GitHub

View Source Repository

Related Skills

Worktree Tasks — Git skill for Claude Code

Worktree Tasks

Implement each task in a separate git worktree with an opus subagent then sequentially merge and commit them b

Git community
Create Worktree + Spawn Agent — Git skill for Claude Code

Create Worktree + Spawn Agent

git worktree add ../feat-custom-templates -b feat/custom-templates origin/main cd ../feat-custom-templates &&

Git community
Merge Command — Git skill for Claude Code

Merge Command

Finalize worktree work: update docs, commit, merge to main, clean up. Context from user: $ARGUMENTS ---

Git community
Merge Worktree Approvals — Git skill for Claude Code

Merge Worktree Approvals

Merge the Claude auto-approval permissions from a worktree into the main repo.

Git community
Cleanup Worktree — Git skill for Claude Code

Cleanup Worktree

Remove a merged worktree and its branch after verifying it was merged into main

Git community
Branchit — Git skill for Claude Code

Branchit

Create a new branch and git worktree. Always branches from main unless told otherwise. Flags a dirty tree; ign

Git community

Related Agents

Merge Cleanup — Development agent for Claude Code

Merge Cleanup

Commits worktree changes, cherry-picks them to main, removes the worktree, and prunes the branch. Use at the e

Development community
Develop — Testing & QA agent for Claude Code

Develop

Implements a fix or feature for a single GitHub issue in an isolated worktree. Iterates up to 3 cycles (merge

Testing & QA community
Team Merger — Testing & QA agent for Claude Code

Team Merger

Agent-teams merger. Merges each reviewed-and-approved worktree into the base branch in turn, resolves conflict

Testing & QA community