Git Flow

Git Flow is a branching model with dedicated branches for features, releases, and hotfixes.

Syntax

GIT

1
2
3
4
5
6

main       ← production
  develop  ← integration
    feature/login
    feature/dashboard
  release/v1.0
  hotfix/critical-bug

Git Flow Workflow

BASH

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

# Git Flow branches:
# main - production
# develop - development
# feature/* - new features
# release/* - release prep
# hotfix/* - production fixes

# Start a feature
git flow feature start user-auth

# Finish feature (merges to develop)
git flow feature finish user-auth

# Start a release
git flow release start 1.0.0

# Finish release (merges to main + develop)
git flow release finish 1.0.0

Try It Yourself

Next Lesson

Trunk-Based Development