git-strategy

Guide Git Flow branching and Conventional Commits for version control.

Updated Jan 11, 2026

Search Tags:#git #version control #conventional commits #commit message #branching strategy #git flow

Ready to run

npx skills add https://github.com/gykk16/spring-skeleton --skill git-strategy

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-strategy
Source: https://github.com/gykk16/spring-skeleton/tree/main/.omc/skills/git-strategy
Command: npx skills add https://github.com/gykk16/spring-skeleton --skill git-strategy

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides a comprehensive guide to implementing the Git Flow branching model and adhering to Conventional Commits, ensuring a structured and efficient version control workflow.

Core Features & Use Cases

Git Flow Implementation: Detailed explanation of branch structures, types, and workflows for main, develop, feature, release, and hotfix branches.
Conventional Commits: Guidelines for commit message structure, types, and rules to standardize commit history.
Merge Strategy: Clear directives on when to use merge commits versus rebasing.
Use Case: A new developer joins a project and needs to understand the team's Git workflow. This Skill provides all the necessary information to get them up to speed on branching, committing, and merging practices.

Quick Start

Follow the Git Flow branching model and Conventional Commits format for all Git operations.

Frequently Asked Questions about git-strategy

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

FAQPage Schema

How do I structure branches using the Git Flow workflow?▼

Git Flow structures branches into main, develop, feature, release, and hotfix types. Each branch serves a specific purpose, isolating development, preparing releases, and fixing production issues to streamline version control.

What is the Conventional Commits format for commit messages?▼

Conventional Commits formats commit messages using a structured syntax with specific types and rules. This standardizes commit history, clarifying the nature of changes for features, fixes, or breaking changes in version control.

When should I use merge commits versus rebasing in Git Flow?▼

Merge commits and rebasing in Git Flow are dictated by specific branching scenarios. Clear directives enforce when to preserve branch history with merges versus applying commits linearly through rebasing for a streamlined version control workflow.

How do I name release and hotfix branches in Git Flow?▼

Git Flow dictates strict naming conventions for release and hotfix branches. This ensures consistent version control practices, clearly identifying branch purposes and aligning with semantic versioning tag conventions for releases and fixes.

Does Git Flow work with semantic versioning for release tags?▼

Git Flow integrates seamlessly with semantic versioning by providing specific tag conventions. This ensures release and hotfix branches are properly labeled, delivering a structured and predictable version control workflow for your project.

What are the step by step workflow steps for a feature branch in Git Flow?▼

Git Flow feature branch workflow steps involve branching from develop, committing changes using Conventional Commits, and merging back. This isolates feature development, maintaining a structured and efficient version control history.