lmiranda
e5ca804692
- Rename marketplace to lm-claude-plugins - Move MCP servers to root with symlinks - Add 6 PR tools to Gitea MCP (list_pull_requests, get_pull_request, get_pr_diff, get_pr_comments, create_pr_review, add_pr_comment) - Add clarity-assist plugin (prompt optimization with ND accommodations) - Add git-flow plugin (workflow automation) - Add pr-review plugin (multi-agent review with confidence scoring) - Centralize configuration docs - Update all documentation for v3.0.0 BREAKING CHANGE: MCP server paths changed, marketplace renamed Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
84 lines
1.5 KiB
Markdown
84 lines
1.5 KiB
Markdown
# /commit-merge - Commit and Merge
|
|
|
|
## Purpose
|
|
|
|
Commit current changes, then merge the current branch into a target branch.
|
|
|
|
## Behavior
|
|
|
|
### Step 1: Run /commit
|
|
|
|
Execute the standard commit workflow.
|
|
|
|
### Step 2: Identify Target Branch
|
|
|
|
Check environment or ask:
|
|
|
|
```
|
|
Merge into which branch?
|
|
1. development (Recommended - GIT_DEFAULT_BASE)
|
|
2. main
|
|
3. Other: ____
|
|
```
|
|
|
|
### Step 3: Merge Strategy
|
|
|
|
```
|
|
How should I merge?
|
|
1. Merge commit (preserves history)
|
|
2. Squash and merge (single commit)
|
|
3. Rebase (linear history)
|
|
```
|
|
|
|
### Step 4: Execute Merge
|
|
|
|
```bash
|
|
# Switch to target
|
|
git checkout <target>
|
|
|
|
# Pull latest
|
|
git pull origin <target>
|
|
|
|
# Merge feature branch
|
|
git merge <feature-branch> [--squash] [--no-ff]
|
|
|
|
# Push
|
|
git push origin <target>
|
|
```
|
|
|
|
### Step 5: Cleanup (Optional)
|
|
|
|
```
|
|
Merge complete. Delete the feature branch?
|
|
1. Yes, delete local and remote (Recommended)
|
|
2. Delete local only
|
|
3. Keep the branch
|
|
```
|
|
|
|
## Environment Variables
|
|
|
|
| Variable | Default | Description |
|
|
|----------|---------|-------------|
|
|
| `GIT_DEFAULT_BASE` | `development` | Default branch to merge into |
|
|
| `GIT_MERGE_STRATEGY` | `merge` | Default merge strategy |
|
|
| `GIT_AUTO_DELETE_MERGED` | `true` | Auto-delete merged branches |
|
|
|
|
## Safety Checks
|
|
|
|
- Verify target branch exists
|
|
- Check for uncommitted changes before switching
|
|
- Ensure merge doesn't conflict (preview first)
|
|
|
|
## Output
|
|
|
|
On success:
|
|
```
|
|
Committed: abc1234
|
|
feat(auth): add password reset functionality
|
|
|
|
Merged feat/password-reset → development
|
|
Deleted branch: feat/password-reset
|
|
|
|
development is now at: def5678
|
|
```
|