Lesson 26 / 26

Git Flow vs Trunk-Based

Two well-known branching strategies, at a glance.

Git Flow

Git Flow uses long-lived develop and main branches plus dedicated feature/, release/, and hotfix/ branches. Structured, but heavier for fast-moving teams.

Trunk-based development

Everyone commits small, frequent changes directly to (or via very short branches into) a single main trunk, often behind feature flags — favored for continuous delivery.

Quick check: Which strategy favors small, frequent commits straight into one trunk?

  • Git Flow
  • Trunk-based development
  • Both equally
Answer

Trunk-based development — Trunk-based development minimizes long-lived branches in favor of continuous integration into main.