Commit staged changes, rebase onto the base branch, and merge with workmux.
npx skills add https://github.com/pattobrien/dotfiles --skill merge-pattobrien
Please help me install this Agent Skill. Skill: merge Source: https://github.com/pattobrien/dotfiles/tree/main/claude/skills/merge Command: npx skills add https://github.com/pattobrien/dotfiles --skill merge-pattobrien
workmux-base, defaulting to main) with explicit conflict-resolution guidance that preserves changes from both branches. - Workmux Merge: Runs 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 skill to commit, rebase onto main, and merge in one flow without manually juggling git commands. ## Quick Start Ask the assistant to run the merge skill to commit, rebase, and merge the current branch, optionally passing --keep to retain the worktree.High-intent search queries and answers about installing and using this skill.
Invoke the merge skill, which commits staged changes, rebases onto the configured base branch, and runs workmux merge to finalize. Flags like --keep and --no-verify can be passed as arguments to adjust behavior.
It reads the git config key branch.<current-branch>.workmux-base to find the base branch. If no base is configured, it defaults to main and rebases onto the local branch only.
No, the skill explicitly never runs git fetch and never rebases onto origin/<branch>. It rebases only onto the local base branch, such as git rebase main.
The skill inspects recent base-branch changes to each conflicting file with git log -p -n 3 before resolving. It preserves changes from both branches, stages resolved files, continues the rebase, and asks for guidance if a conflict is too complex.
Yes, pass the --keep or -k flag as an argument. The skill forwards --keep to workmux merge so the worktree and tmux window are retained instead of cleaned up.
wesbragagtCommits staged changes, rebases onto the base branch, and merges via workmux.
XiriGoPush a local Git branch and create a pull request via GitHub CLI.
rickyanandaReview staged git diffs for security, logic, and regression issues.
jaesoekjjangIntegrate a local branch into a base branch using git rebase and workmux merge.