Skill

merge

Commits staged changes, rebases onto local base branch, resolves conflicts, and merges via workmux. Use before finishing a feature branch; supports --keep and --no-verify.

Git

Bash

developer-tools

automation

Install

npx claudepluginhub raine/workmux --plugin workmux-status

Tool Access

This skill is limited to using the following tools:

ReadBashGlobGrep

Preview

SKILL.md

Similar Skills

cache-components

Guides Next.js Cache Components and Partial Prerendering (PPR) with cacheComponents enabled. Implements 'use cache', cacheLife(), cacheTag(), revalidateTag(), static/dynamic optimization, and cache debugging.

cache-components

139.2k

mcp-builder

9 files

Guides building MCP servers enabling LLMs to interact with external services via tools. Covers best practices, TypeScript/Node (MCP SDK), Python (FastMCP).

anthropics-skills-13

124.2k

canvas-design

20 files

Generates original PNG/PDF visual art via design philosophy manifestos for posters, graphics, and static designs on user request.

anthropics-skills-13

124.2k

Stats

Stars1359

Forks91

Last CommitFeb 28, 2026

Actions

View Source View Plugin View on GitHub View README

Step 1: Commit

If there are staged changes, commit them. Use lowercase, imperative mood, no conventional commit prefixes. Skip if nothing is staged.

Step 2: Rebase

Get the base branch from git config:

git config --local --get "branch.$(git branch --show-current).workmux-base"

If no base branch is configured, default to "main".

Rebase onto the local base branch (do NOT fetch from origin first):

git rebase <base-branch>

IMPORTANT: Do NOT run git fetch. Do NOT rebase onto origin/<branch>. Only rebase onto the local branch name (e.g., git rebase main, not git rebase origin/main).

If conflicts occur:

BEFORE resolving any conflict, understand what changes were made to each conflicting file in the base branch
For each conflicting file, run git log -p -n 3 <base-branch> -- <file> to see recent changes to that file in the base branch
The goal is to preserve BOTH the changes from the base branch AND our branch's changes
After resolving each conflict, stage the file and continue with git rebase --continue
If a conflict is too complex or unclear, ask for guidance before proceeding

Step 3: Merge

Run: workmux merge --rebase --notification [--keep] [--no-verify]

Include --keep only if the --keep flag was passed in arguments. Include --no-verify only if the --no-verify flag was passed in arguments.

This will merge the branch into the base branch and clean up the worktree and tmux window (unless --keep is used).