DevOps Blog

A Beginner’s Guide to Git-Flow: Streamline Your Git Workflow

What is Git-Flow?

Git-flow is a branching strategy for Git, popularized by Vincent Driessen. It defines a strict branching model designed around:

  • Main branches (main and develop)
  • Supporting branches (feature, release, and hotfix)

This structure helps teams manage features, releases, and bug fixes in an organized way.

Setting Up Git-Flow

1. Install Git-Flow

If you haven’t already, install the git-flow extension:

  • Linux/macOS:
    brew install git-flow-avh # macOS (via Homebrew)
  • Windows:
    Git-flow is included in tools like Git Extensions or SourceTree.

2. Initialize Git-Flow in Your Repo

Run this in your project directory:

git flow init

You’ll be prompted to name your branches (defaults are main for production and develop for ongoing work).

The Git-Flow Workflow

1. Main Branches

  • main – The production-ready branch (always stable).
  • develop – The integration branch for completed features.

2. Feature Branches

For adding new functionality:

git flow feature start my-feature # Creates: feature/my-feature

Work on your feature, then finish it:

git flow feature finish my-feature # Merges into 'develop'

3. Release Branches

When develop is ready for a release:

git flow release start 1.0.0

Test, fix bugs, then finish:

git flow release finish 1.0.0 # Merges into 'main' and tags the version

4. Hotfix Branches

For urgent production fixes:

git flow hotfix start 1.0.1

After fixing:

git flow hotfix finish 1.0.1 # Merges into 'main' and 'develop'

Why Use Git-Flow?

Clear structure – No more guessing which branch to use.
Parallel development – Features can be worked on independently.
Stable releases – main stays clean and deployable.
Easy hotfixes – Critical bugs get fixed without disrupting development.

When Not to Use Git-Flow

Git-flow is great for versioned software (like apps or libraries) but may be overkill for:

  • Small solo projects
  • Continuous deployment setups (consider GitHub Flow instead)

Final Thoughts

Git-flow is a powerful way to manage complex projects. If your team struggles with merge conflicts or chaotic branches, give it a try!

Pro Tip: Tools like SourceTree or GitKraken provide visual git-flow support.

Have you used git-flow before? Share your experience in the comments!

Next Steps:

Happy branching!