Squash merge feature branch commits into main with a Conventional Commit message.
npx skills add https://github.com/haleyrc/stele --skill feature-merge
Please help me install this Agent Skill. Skill: feature-merge Source: https://github.com/haleyrc/stele/tree/main/.claude/skills/feature-merge Command: npx skills add https://github.com/haleyrc/stele --skill feature-merge
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.
main.main branch maintains a clean, linear history with clear, high-level commit messages, simplifying future rollbacks and audits.git checkout main git pull origin main git merge --squash my-new-feature
git commit -m "feat: Add my new feature with a clear summary"
High-intent search queries and answers about installing and using this skill.
Squash merging consolidates all commits from a feature branch into a single commit on main. Check out main, pull the latest changes, run `git merge --squash` on your feature branch, then commit with a descriptive message. This creates a clean, linear history without intermediate commits.
Use Conventional Commits format: start with a type (feat, fix, etc.) followed by a colon and summary. Analyze all changes from your feature branch to craft a clear, high-level description. This standardized approach makes your commit history readable and supports automated tooling.
Squash merge is ideal when integrating a completed feature, shipping work, or maintaining a clean main branch history. Use it when you want a single, descriptive commit representing the entire feature rather than preserving intermediate development commits.
Yes. After a successful squash merge, delete the feature branch locally with `git branch -d` and remotely with `git push origin --delete`. This prevents accumulation of stale branches and keeps your repository organized.
Verify you're on the correct branch, main exists and is up to date, your working directory is clean, and your feature branch has diverged from main. These preconditions prevent accidental data loss and ensure a smooth merge operation.
glhewettCreate and push a remote-tracked feature branch from main.
assertchrisSync local Claude skills with a remote Git repository.
eysenfalkEnforce Git branch naming, commit message formats, and merge policies.
JacobPEvansRebase pull requests onto main with signed commits and GitHub API checks.