git:smart-merge

slash command claude_code

Slash Command Analysis

Re-analyzes command for arguments and references

Original Content

---
allowed-tools: Bash(git:*), Bash(npm:*), Bash(yarn:*), Bash(test:*), Bash(build:*)
description: Smart merge with intelligent conflict resolution and testing
---

# Smart merge with conflict resolution

Merge $ARGUMENTS (source branch) into current branch with intelligent conflict
resolution.

## Process

1. Fetch latest changes from origin
2. Create backup branch: `backup-merge-$(date +%s)`
3. Attempt merge with strategy options
4. If conflicts exist:
   - Analyze conflict patterns
   - Suggest resolution strategies
   - Apply automated fixes for simple conflicts
   - List remaining manual conflicts with context
5. Run tests if available
6. Provide rollback instructions

## Report

- Merge status and strategy used
- Conflicts resolved automatically vs manually
- Test results
- Rollback command if needed

Convert to Different Formats

Actions

(Clears cached conversions and forces re-processing)
← Back to List