lmiranda
71f1f3239a
BREAKING CHANGE: All generic command names now prefixed with plugin namespace. See CHANGELOG.md v7.0.0 for complete rename map. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1.3 KiB
1.3 KiB
name, description, agent
| name | description | agent |
|---|---|---|
| commit-merge | Commit current changes and merge branch into target | git-assistant |
/commit-merge - Commit and Merge
Skills
- skills/visual-header.md
- skills/commit-conventions.md
- skills/merge-workflow.md
- skills/git-safety.md
- skills/environment-variables.md
Purpose
Commit current changes, then merge the current branch into a target branch.
Parameters
| Parameter | Description |
|---|---|
--target |
Target branch (default: GIT_DEFAULT_BASE) |
--squash |
Squash commits on merge |
--no-delete |
Keep branch after merge |
Workflow
- Display header - Show GIT-FLOW Commit & Merge header
- Run /commit - Execute standard commit workflow
- Identify target - Prompt for target branch if not specified
- Select strategy - Merge commit, squash, or rebase (per merge-workflow.md)
- Execute merge - Switch to target, pull, merge, push
- Handle conflicts - Guide resolution if needed
- Cleanup - Offer to delete merged branch (per git-safety.md)
- Report - Show merge summary
Output
Committed: abc1234
feat(auth): add password reset functionality
Merged feat/password-reset -> development
Deleted branch: feat/password-reset
development is now at: def5678