merge-strategy

What problem does it solve?

This Skill automates the complex decision-making process for choosing and executing Git merge strategies, ensuring consistency, safety, and adherence to team conventions while minimizing manual effort and potential errors.

Core Features & Use Cases

• Automated Strategy Recommendation: Analyzes branch divergence, commit history, conflict potential, and team conventions to recommend the optimal merge strategy (merge, rebase, squash).
• Safe Execution: Implements pre-merge checks, creates safety branches, and performs post-merge validation (tests, linting) with rollback capabilities.
• Conflict Analysis & Guidance: Provides insights into conflict complexity and suggests resolution approaches, integrating with other conflict-resolution skills.
• Use Case: When finishing a feature branch, instead of manually deciding between merge, rebase, or squash, you can simply run /merge-strategy and it will analyze the situation, recommend the best approach (e.g., "squash merge due to team convention"), and offer to execute it safely.

Quick Start

Run /merge-strategy to analyze the current branch and receive a recommended merge strategy.