How does the skill help with merge conflicts?

When a conflict occurs, the skill automatically runs git log for the conflicting files on the base branch, giving you the context needed to preserve changes from both sides.

What is the default base branch used for rebasing?

The skill first checks your local git config for a 'workmux-base' value; if none is found, it defaults to merging into 'main'.

Can I keep my tmux window open after the merge is complete?

Yes, by passing the --keep flag to the command, the skill will instruct workmux to preserve the worktree and tmux window instead of cleaning them up.

Does this skill fetch from the remote repository during rebase?

No, the skill is designed to rebase onto the local base branch only, ensuring speed and avoiding unintended synchronization issues with the origin.

Workmux Git Merge

Name: Workmux Git Merge
Author: raine

byraine

•

819

•

Developer Tools

Streamlines Git branch finalization by committing, rebasing, and merging branches within workmux environments.

Workmux Git Merge is designed to automate the repetitive tasks associated with finishing a feature branch in a parallel development environment. It guides Claude through a structured three-step process: committing staged changes with imperative messaging, rebasing onto a local base branch (defaulting to main), and executing the final workmux merge command. This skill is essential for developers using git worktrees and tmux windows, as it ensures a clean exit by automatically cleaning up the development environment while providing context-aware conflict resolution assistance.