skills.rest
costa-marcello
costa-marcelloCOMMUNITY
Explore all skills by this author →
GitHub

smart-merge

Automate Git merges with pre-merge validation and feature branch preservation.

2|1|Updated Feb 9, 2026
Search Tags:#automation#git#validation#merge#branch#ci#pre-merge
One-click install
npx skills add https://github.com/costa-marcello/skillkit --skill smart-merge
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: smart-merge
Source: https://github.com/costa-marcello/skillkit/tree/main/skills/smart-merge
Command: npx skills add https://github.com/costa-marcello/skillkit --skill smart-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about smart-merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate safe Git branch merges with pre-merge validation?▼

Automated Git branch merges use pre-merge validation gates to run typecheck, lint, tests, and build before integrating changes. This ensures code stability and prevents regressions by verifying all checks pass before merging branches.

What is the best way to sync a feature branch with main without losing progress?▼

Syncing a feature branch with main requires a merge mode that pulls changes from main into the feature branch while preserving it. This automated sync process includes validation gates and conflict handling guidance to keep your feature work intact.

Can I use automated merge validation for multi-language software projects?▼

Automated merge validation supports multi-language projects through language-agnostic validation gates. It detects the package manager to run the correct typecheck, lint, test, and build commands, ensuring safe integration regardless of the project's tech stack.

How do I handle merge conflicts and unreplied PR comments before merging?▼

Merge conflicts and unreplied PR comments are handled through workflow guardrails that provide clear conflict resolution guidance and check for unreplied review comments. This prevents merging code with unresolved discussions or integration issues.

Does automated branch merging preserve the feature branch after a PR merge?▼

Automated branch merging preserves the feature branch after a PR merge to safeguard against data loss. Post-merge verification confirms the branch state and history integrity, ensuring the feature branch remains intact and no forced pushes occur.

Related Skills

Explore More Software Engineering Skills→
HerbertJulioHerbertJulio
20

finish

Run final validation checks and prepare a merge-ready summary for feature branches.

Community
Advanced
the-agency-aithe-agency-ai
39

pr-captain-post-merge

Automates GitHub post-merge validation, release tagging, and branch cleanup workflows.

Official
Intermediate
AribSudiaAribSudia
2

arib-wave-end

Audit development waves, generate stakeholder reports, and manage secure branch merges.

Community
Advanced
BaqiF2BaqiF2
3

merge-pr

Merge GitHub Pull Requests after CI checks and code review pass.

Community
Advanced