skills.rest
glhewett
glhewettCOMMUNITY
Explore all skills by this author →
Website𝕏@greg_hewettGitHub

git-feature-complete

Merge feature branches into main and delete them after passing checks.

Updated Feb 15, 2026
Search Tags:#automation#git#merge#branch-management#git-workflow#feature-branch
One-click install
npx skills add https://github.com/glhewett/public-skills --skill git-feature-complete
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-feature-complete
Source: https://github.com/glhewett/public-skills/tree/main/git-feature-complete
Command: npx skills add https://github.com/glhewett/public-skills --skill git-feature-complete

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Provides a safe, repeatable way to merge a feature branch into the main branch while ensuring the repository is clean, tests and linters pass, and the feature branch is removed after a successful merge to keep the branch history tidy.

Core Features & Use Cases

  • Ensures there are no unstaged or uncommitted changes and that tests and linting complete without errors before proceeding.
  • Confirms the merge target, performs a no-fast-forward merge, pushes main to the remote, and deletes the local feature branch on success.
  • Use case: finalizing a feature/* branch in a small to medium repository where automated checks must pass before merging to main.

Quick Start

Ask the skill to finish the current feature branch by merging it into main, pushing the result to the remote, and deleting the local feature branch when the merge succeeds.

Frequently Asked Questions about git-feature-complete

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

FAQPage Schema
How do I safely merge a feature branch into main and clean it up?▼

To safely merge a feature branch, the workflow checks for uncommitted changes, validates that tests and linting pass, executes a no-fast-forward merge into main, pushes the result to the remote, and deletes the local feature branch upon success.

What checks are needed before merging a git feature branch?▼

Before merging a git feature branch, you need to ensure there are no unstaged or uncommitted changes, verify that tests complete without errors, and confirm that linting passes to keep the repository clean.

Does this git merge workflow work for large repositories?▼

This git merge workflow is designed for small to medium repositories where feature branches must be tested, merged into main, and deleted. It may not be suitable for large-scale repository management.

Why use a no-fast-forward merge for feature branches?▼

A no-fast-forward merge is used to preserve the feature branch's commit history, creating a dedicated merge commit. This ensures the feature branch context is maintained when integrating changes into the main branch.

What is the best way to automate feature branch deletion after merging?▼

Automating feature branch deletion involves a workflow that pushes the merged main branch to the remote and subsequently deletes the local feature branch automatically, but only if the merge and all pre-merge checks succeed.

Related Skills

Explore More Software Engineering Skills→
ahandselahandsel
1

git-pull-main

Synchronizes local Git feature branches with the remote main branch.

Community
Intermediate
takemi-ohamatakemi-ohama

deploy

Create a deploy branch and PR from a feature branch to a target environment.

Community
Advanced
glhewettglhewett

git-commit

Create atomic git commits with branch validation and optional lint and test checks.

Community
Intermediate
hojinzshojinzs
16

push

Publish verified local commits to a remote Git branch with pre-push validation.

Community
Intermediate