# Merge Strategy

> Intelligent merge/rebase strategy selection with safe execution

- Skill: `manastalukdar/merge-strategy` (Agent Skill)
- Install (CLI): `npx skillmds@latest add manastalukdar/merge-strategy`
- Raw SKILL.md: https://api.skillmd.com/api/skills/manastalukdar/merge-strategy/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: manastalukdar (https://skillmd.com/u/manastalukdar)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/manastalukdar/merge-strategy

---


# 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

**Expected range**: 1,500–2,500 tokens (initial), 100 tokens (fast-forward)

**Caching**: No persistent caching — analyzes current git state on each run.

**Early exit**: Returns immediately if the merge is a clean fast-forward.

**Patterns used**: Grep-before-Read, early exit, Bash for system queries