feature-merge

What problem does it solve?

Managing messy Git histories from feature branches can be time-consuming and make your main branch difficult to audit. This Skill automates the process of consolidating multiple feature commits into a single, clean, and descriptive squash commit, simplifying your project's history.

Core Features & Use Cases

• Automated Squash Merge: Consolidates all commits from a feature branch into a single, well-structured commit on main.
• Conventional Commit Generation: Analyzes branch changes to craft a summary commit message adhering to Conventional Commits standards.
• Branch Cleanup: Automatically deletes the local and remote feature branches after a successful merge.
• Use Case: When a feature is complete and ready for integration, use this Skill to ensure your main branch maintains a clean, linear history with clear, high-level commit messages, simplifying future rollbacks and audits.

Quick Start

Assuming you are on your feature branch, e.g., 'my-new-feature'

git checkout main git pull origin main git merge --squash my-new-feature

Then, craft your comprehensive commit message and commit

git commit -m "feat: Add my new feature with a clear summary"