Commit staged changes, rebase onto the base branch, and merge with workmux.
npx skills add https://github.com/okm321/dotfiles --skill merge-okm321
Please help me install this Agent Skill. Skill: merge Source: https://github.com/okm321/dotfiles/tree/main/claude/skills/merge Command: npx skills add https://github.com/okm321/dotfiles --skill merge-okm321
workmux merge --rebase --notification to merge the branch and clean up the worktree and tmux window, with optional --keep and --no-verify flags. - Use Case: After finishing a feature in a workmux-managed worktree, invoke the merge command to commit, rebase onto main, and merge in one consistent workflow. ## Quick Start Run the merge command to commit my staged changes, rebase onto the base branch, and merge with workmux.High-intent search queries and answers about installing and using this skill.
Invoke the merge command, which commits any staged changes, rebases onto the configured base branch, and runs workmux merge to merge and clean up. Flags like --keep and --no-verify can be passed as arguments.
The skill reads the base branch from git config key branch.<current>.workmux-base, defaulting to main, then runs git rebase on the local branch name only. It never runs git fetch or rebases onto origin/<branch>.
Before resolving, the skill inspects each conflicting file with git log -p -n 3 <base-branch> -- <file> to understand base branch changes. It then resolves to preserve both sides, stages the file, and continues with git rebase --continue, asking for guidance on unclear conflicts.
The --keep flag (or -k) is passed through to workmux merge, which keeps the worktree and tmux window after merging instead of cleaning them up. The --no-verify flag (-n) similarly passes --no-verify to workmux merge.
If git config returns no workmux-base value for the current branch, the skill defaults to rebasing onto main. The rebase still targets the local branch only, never a remote-tracking branch.
evatt-harvey-salingerParse task descriptions and create isolated git worktrees with workmux.
XiriGoPush a local Git branch and create a pull request via GitHub CLI.
blakesimsValidate feature branch merge readiness with integration checks and summaries.
JenilRevaliyaGuides Git branching, commit conventions, pull requests, and GitHub workflow configuration.