smart-merge

Community

Safe, automated branch merges with validation.

Authorcosta-marcello
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Branch merges can introduce conflicts, regressions, and risk to feature work; this skill automates thorough pre-merge validation and preserves the feature branch during integration.

Core Features & Use Cases

  • Pre-merge validation gates (typecheck, lint, tests, and build) to ensure green checks before merging.
  • Two merge modes: Sync (main -> feature) to keep a feature branch up-to-date, and PR Merge (feature -> main) to finalize work with safety checks.
  • Package-manager detection to select the correct test and build commands across languages.
  • Conflict resolution workflow with clear guidance, and post-merge verification to confirm branch state and history integrity.
  • Guardrails: ensure unreplied review comments are handled, avoid forced pushes, and preserve the feature branch after merges.

Quick Start

To start, perform pre-merge validation and then choose between Sync or PR Merge to safely integrate changes while preserving the feature branch.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: smart-merge
Download link: https://github.com/costa-marcello/skillkit/archive/main.zip#smart-merge

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.