merge-main-cleanup_skill

Overview

This skill performs a full merge of the current work into the repository base branch (prefer main, fallback master) and then deletes all other local and remote branches, leaving only the base branch. It also removes any git worktrees tied to deleted branches. Use this when you want a destructive one-step cleanup after finishing work and consolidating history into main.

How this skill works

The skill validates the repo is clean, discovers the base branch, and merges the current branch into that base. It pushes the updated base to the default remote, removes worktrees for branches that will be deleted, then force-deletes all non-base local branches and removes their remote counterparts. It finishes by verifying only the base branch remains locally and remotely.

When to use it

• You want to merge your current branch into main (or master) and then remove every other branch.
• You need to perform a one-step destructive cleanup after code consolidation.
• You are certain all branch histories except the base can be deleted.
• You want to remove all git worktrees tied to branches you plan to delete.
• You prefer an automated sequence: validate, merge, push, remove worktrees, delete branches.

Best practices

• Ensure working directory has no uncommitted changes before running this skill.
• Create a backup or tag the base branch before destructive deletion if you might need recovery.
• Confirm the remote name (origin assumed) and replace it if your remote is named differently.
• Resolve merge conflicts manually when they occur; the skill will pause for conflict resolution.
• Notify collaborators before deleting remote branches to avoid data loss or interrupted workflows.

Example use cases

• Finish a feature branch, merge into main, and remove all development branches to simplify the repo.
• Clean up a repository after a rebase/cleanup sprint where only main should remain.
• Prepare a repository for archiving by consolidating changes into main and deleting other branches.
• Remove stale branches and associated worktrees after a cleanup review.