merge

Commit staged changes, rebase onto the configured base branch, and merge with cleanup.

2.1k|295|Updated Nov 4, 2025
One-click install
npx skills add https://github.com/raine/workmux --skill merge-raine
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/raine/workmux/tree/main/skills/merge
Command: npx skills add https://github.com/raine/workmux --skill merge-raine

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill streamlines the finalization of work on the current Git branch by automating a commit of staged changes, a local rebase onto the configured base branch, and a clean merge that tidies the worktree and tmux window.

Core Features & Use Cases

  • Automated commit of staged changes using a clear, imperative style and no prefixes.
  • Local rebase onto the base branch configured in git (default to main if not configured) without fetching from origin.
  • Final merge and cleanup via workmux, consolidating the worktree and tmux window.
  • Safe handling of conflicts with guidance to inspect changes before continuing.

Quick Start

Follow the sequence: commit staged changes, rebase onto the configured base branch, then run workmux merge --rebase --notification to complete the workflow.

Frequently Asked Questions about merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate committing, rebasing, and merging in Git?

This skill automates the end-to-end workflow by committing staged changes, rebasing onto your configured base branch, and merging with cleanup in a single sequence. It uses local git configuration to determine the base branch (defaulting to main) and avoids fetching from origin, streamlining feature branch finalization.

Can I use this workflow with tmux and worktrees?

Yes. The skill integrates with tmux and worktrees via workmux, automatically cleaning up both the temporary worktree and associated tmux window after the merge completes, making it ideal for feature development workflows.

What happens if there are merge conflicts during the rebase?

The skill guides you to inspect changes before continuing. It enforces a deterministic sequence and handles conflicts safely, giving you visibility into conflicts before the final merge executes.

Does this skill fetch from origin before rebasing?

No. The skill performs a local rebase onto the base branch configured in your git settings without fetching from origin, keeping the workflow fast and predictable for local-first development.

How do I set a custom base branch for the rebase?

Configure your base branch in git's local configuration; the skill reads this setting automatically and defaults to main if not set. This determines which branch the rebase targets during the merge workflow.