Intelligent Merge Strategy Selector

I'll help you choose the optimal Git merge strategy and execute it safely based on branch analysis, history, and team conventions.

Arguments: $ARGUMENTS - branch name, strategy preference (merge/rebase/squash), or 'auto'

Token Optimization

This skill uses merge strategy-specific patterns to minimize token usage:

1. Branch Analysis Caching (800 token savings)

Pattern: Cache branch divergence analysis results

• Store analysis in merge-strategy/analysis-cache.json (15 min TTL)
• Cache: commit counts, divergence, conflicts, recommendations
• Read cached analysis on subsequent checks (50 tokens vs 850 tokens fresh)
• Invalidate on new commits to either branch
• Savings: 94% on repeated strategy checks

2. Bash-Based Divergence Detection (900 token savings)