Commits staged changes, rebases onto the base branch, and merges via workmux.
npx skills add https://github.com/wesbragagt/nixos-config --skill merge-wesbragagt
Please help me install this Agent Skill. Skill: merge Source: https://github.com/wesbragagt/nixos-config/tree/main/home/skills/merge Command: npx skills add https://github.com/wesbragagt/nixos-config --skill merge-wesbragagt
workmux merge --rebase --notification to merge and clean up the worktree and tmux window, with optional --keep and --no-verify flags. - Use Case: After finishing work in a workmux-managed worktree, invoke the command to commit, rebase onto main, and merge in one flow, optionally keeping the worktree alive with --keep. ## Quick Start Ask the assistant to run the merge command to commit staged changes, rebase onto the base branch, and merge the current branch with workmux.High-intent search queries and answers about installing and using this skill.
Run the merge command, which commits any staged changes, rebases onto the configured base branch, and then runs workmux merge to finish the branch. Flags like --keep and --no-verify are forwarded to workmux merge.
The base branch is read from the git config key branch.<current-branch>.workmux-base. If no base branch is configured, it defaults to main, and the rebase always targets the local branch rather than origin.
Before resolving a conflict, the workflow runs git log -p -n 3 on the base branch for each conflicting file to understand recent changes. The goal is to preserve both sides' changes, then stage the file and run git rebase --continue.
Yes, pass the --keep or -k flag, which forwards --keep to workmux merge so the worktree and tmux window are not cleaned up. The --no-verify or -n flag similarly skips verification hooks.
No, the instructions explicitly prohibit running git fetch or rebasing onto origin/<branch>. The rebase only targets the local base branch, such as git rebase main.
okm321Commit staged changes, rebase onto the base branch, and merge with workmux.
tribedotrunCreate GitHub pull requests and trigger AI reviewers with CI monitoring.
blakesimsValidate feature branch merge readiness with integration checks and summaries.
EpiphyticCommit staged changes, rebase branches, and run workmux merge workflows.