skills.rest
zach-source
zach-sourceCOMMUNITY
Explore all skills by this author →
GitHub

gitflow

Implement GitFlow branching with feature, release, and hotfix workflows.

Updated Feb 18, 2026
Search Tags:#git#workflow#release management#version control#branching#gitflow
One-click install
npx skills add https://github.com/zach-source/claude-plugins --skill gitflow-zach-source
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: gitflow
Source: https://github.com/zach-source/claude-plugins/tree/main/plugins/git-tools/skills/gitflow
Command: npx skills add https://github.com/zach-source/claude-plugins --skill gitflow-zach-source

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill provides a comprehensive guide and automated tasks for implementing Vincent Driessen's GitFlow branching model, ensuring structured and manageable release cycles.

Core Features & Use Cases

  • Branching Strategy: Clearly defines and explains the roles of main, develop, feature, release, and hotfix branches.
  • Workflow Automation: Offers tasks for starting and finishing features, releases, and hotfixes.
  • Use Case: When preparing for a new software release, use this Skill to correctly initiate a release branch, perform necessary fixes, and merge it back into both main and develop with proper tagging.

Quick Start

Use the gitflow skill to start a new feature branch named 'user-authentication'.

Frequently Asked Questions about gitflow

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

FAQPage Schema
How do I manage feature branches and release branches using GitFlow?▼

GitFlow manages feature and release branches by defining specific workflows for starting, updating, and finishing them with strict naming conventions and merge strategies. It uses a structured branching model to separate ongoing development from stable release preparation.

What is the correct way to merge a hotfix branch back into the main repository?▼

A hotfix branch requires dual merges back into both the main and develop branches using the `--no-ff` merge strategy. This ensures the production fix is applied to the active development line while maintaining a clear, traceable merge history in your version control system.

Does GitFlow require `--no-ff` merges for all branch integrations?▼

Yes, GitFlow requires `--no-ff` merges to ensure a non-fast-forward merge history. This preserves the structural context of feature, release, and hotfix branches, visually distinguishing grouped commits within the version control timeline.

How do I start a new feature branch like 'user-authentication' with structured release management?▼

To start a new feature branch, branch off from the develop branch and name it following the feature convention, such as 'user-authentication'. Workflow automation tasks handle the correct initialization to maintain a structured software development cycle.

When should I use a dedicated release branch instead of committing directly to main?▼

Use a dedicated release branch when preparing for a new software release to isolate final fixes and tagging from ongoing feature development. This prevents uncompleted features from merging into the main production branch during version control operations.

Can I automate the initialization and finishing of release workflows in Git?▼

Yes, workflow automation scripts can initiate and finalize release branches, handling the dual merges to main and develop automatically. This enforces the GitFlow branching model and ensures proper version tagging without manual merge errors.

Related Skills

Explore More Software Engineering Skills→
Galaxy-DawnGalaxy-Dawn
5.1k

git-workflow

Enforce Conventional Commits and standardized Git branching, PR, and release workflows.

Community
Basic
AndrewDrygaAndrewDryga
28

release

Create semantic version tags from changelogs and push them to Git.

Community
Advanced
PequiProjectPequiProject
2

gitflow

Organize and enforce GitFlow branching for feature, release, and hotfix workflows.

Official
Advanced
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced