/merge_worktree | git-project-management | ClaudePluginHub

Back to Commands

Slash Command

Community

/merge_worktree

From git-project-management

0

Description

Merge the current worktree back to the target branch and clean up: $ARGUMENTS

AI Summary

Merges the current worktree into a target branch, pushes changes, removes the worktree, and optionally deletes the feature branch. Use this to clean up completed worktrees after merging features into main/develop branches.

Install

1

Add the repository(one-time)

$

/plugin marketplace add L-Sypniewski/claude-code-toolkit

2

Install the plugin

$

/plugin install git-project-management@claude-code-toolkit

Command Content

Merge the current worktree back to the target branch and clean up: $ARGUMENTS

Parse arguments to extract:

Target branch (required, first argument like 'master' or 'develop')

Execute these steps:

Check if we're currently in a worktree (not the main repo)
Get current branch name with git branch --show-current
Check for uncommitted changes with git status
If there are uncommitted changes stop process and ask user to commit changes.
Push the current branch to origin
Navigate back to the main repository directory
Switch to the target branch and pull latest changes
Merge the current branch into the target branch
Remove the worktree with git worktree remove <worktree-path>
Ask if I should delete the feature branch locally

Handle any merge conflicts by explaining the resolution process.

Links

GitHub Stats

0 forks

Updated 2 months ago