Menu
Commit, rebase, and merge the current branch.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Rebase the current branch with smart conflict resolution.
Manage, organize, sort, rename, dedupe, or archive files on disk. Use when reshaping a directory tree, batch-renaming, deduplicating, sorting media by date or location, mounting or extracting disk images, or cleaning up a folder. Skip for git operations and code edits.
Guide for creating Dagger modules, toolchains, and CI pipelines using the Go SDK. Use this skill whenever the user wants to create or modify a Dagger module, build a toolchain, write Dagger Functions in Go, or set up CI/CD with Dagger. Also trigger when you see dagger.json, the dagger CLI, imports from dagger, or references to the `dag` client.
Reference and guidance for writing Taskfiles (Taskfile.yaml) and using the `task` / go-task CLI (https://taskfile.dev/). Trigger when the user edits or creates Taskfile.yaml files, runs or troubleshoots the `task` CLI, or asks about Task or `go-task`. SKIP when the user is discussing generic to-do lists, Celery/Airflow/Luigi tasks, Claude Code's own TaskCreate/TaskList tools, or macOS Reminders.
Retrospective on the current session's friction (broken tool calls, repeated prompts, wasted effort), with proposed fixes.
Review code and prose changes against the plan they implemented.
| name | merge |
| description | Commit, rebase, and merge the current branch. |
| disable-model-invocation | true |
| allowed-tools | Read, Bash, Glob, Grep |
Arguments: $ARGUMENTS
Check the arguments for flags:
--keep, -k → pass --keep to workmux merge (keeps the worktree and tmux window after merging)--no-verify, -n → pass --no-verify to workmux mergeStrip all flags from arguments.
Commit, rebase, and merge the current branch.
This command finishes work on the current branch by:
workmux merge to merge and clean upStage all changes and create a single git commit with an appropriate message. Skip this step if there are no changes.
The commit subject must be 70 characters or less. The description must wrap at 70 characters. Use plain ASCII characters only. Keep the description short and to the point.
git statusgit diff HEADgit branch --show-currentgit log --oneline -10If the codebase follows conventional commits (visible in recent commits above), the commit type must follow these rules:
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:
git log -p -n 3 <base-branch> -- <file> to
see recent changes to that file in the base branchgit rebase --continueRun: 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).