merge-helper

Automate feature branch integration with validation and documentation updates.

Updated Apr 11, 2026
One-click install
npx skills add https://github.com/SchurupIK72/HotelAI --skill merge-helper
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge-helper
Source: https://github.com/SchurupIK72/HotelAI/tree/main/.codex/skills/merge-helper
Command: npx skills add https://github.com/SchurupIK72/HotelAI --skill merge-helper

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires pytest, pytest-qt, pre-commit, and includes references (resource) components.

What problem does it solve?

This Skill eliminates the risk of merging incomplete or untested code into the main branch by enforcing a strict, automated quality gate and documentation update process.

Core Features & Use Cases

  • Automated Quality Gates: Ensures all pre-commit hooks, tests, and spec requirements are satisfied before any merge occurs.
  • Documentation Synchronization: Automatically manages CHANGELOG and ARCHITECTURE updates to keep project history accurate.
  • Use Case: When a developer finishes a feature, this Skill verifies that the code is production-ready, updates the project documentation, and performs a clean squash merge into the main branch.

Quick Start

Initiate the merge process for the current feature branch by confirming all requirements are met and executing the merge helper.

Frequently Asked Questions about merge-helper

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

FAQPage Schema
How do I automate feature branch merges with quality checks?

To automate feature branch merges with quality checks, this Skill enforces pre-commit hook execution and test suite verification before performing a clean squash merge into the main codebase. It manages the entire integration lifecycle automatically.

Can I automatically update CHANGELOG and ARCHITECTURE docs during a git merge?

Yes, you can automatically update CHANGELOG and ARCHITECTURE docs during a git merge. The Skill ensures documentation synchronization by automatically managing these project logs and maintaining synchronized history when integrating feature branches.

Does this merge automation tool work with pytest and pre-commit hooks?

Yes, this merge automation tool works directly with pytest and pre-commit hooks. It uses these dependencies as automated quality gates, ensuring all hook executions and test suite verifications are satisfied before any branch integration occurs.

What is the best way to prevent merging untested code into the main branch?

The best way to prevent merging untested code into the main branch is using an automated quality gate. This Skill enforces strict pre-commit hook execution and test suite validation to verify production readiness before completing any merge.

Why do I need to manage feature specifications before merging code?

You need to manage feature specifications before merging code to ensure repository integrity and standardized merge strategies. This Skill manages the lifecycle of feature specifications, validating that all spec requirements are satisfied prior to integration.

Are there limitations to automating squash merges with quality assurance?

Automating squash merges with quality assurance is limited to workflows utilizing pre-commit and pytest environments. It specifically enforces standardized merge strategies and requires all spec requirements and test suites to pass without error before integration.