OneFlow - a Git branching model and workflow

Adam Ruka


  • Cooperate and keep clean history.
  • Standardize feature addition and release processes.


  • First commit:
  • Workflow:
    • Features.
    • Releases.
    • Hotfixes.


  • Why to add
  • What is the project about.
  • How to contribute.
  • How to run the project.
  • What dependencies needed.
  • Also benefits the owner.


  • Why to add LICENSE?
  • Using project by others.


  • Why to keep a
  • What is Semantic Versioning?
    • X.Y.Z
    • Major (backward incompatible).
    • Minor (feature).
    • Patch (hotfix).


  • Features.
  • Releases.
  • Hotfixes.

How not?

Branching workflow: git-flow and github-flow | Numergent

Why not?

Gitflow mess

Why not?

  • Hell a lot of long-live branches.
    • More than 1 is hell a lot.
  • Too complicated.
  • Too chaotic.

OneFlow advantages

  • Single long-live branch, therefore simple.
  • Clean history, therefore useful.

How can it look like?

Git OneFlow Example

GitFlow/OneFlow comparison

Branching workflow: git-flow and github-flow | Numergent Git OneFlow Example

OneFlow: Main branch

  • Only long-live branch.
  • Let’s call it master.

OneFlow: Feature branch

  • New features and bugfixes for upcoming release.
  • Cooperation, can be push forced.

  • Checkout from master.

  • Merge to master.

Feature branch picture

Feature branch

OneFlow: Release branch

  • Prepare project to be released.

  • Start from proper commit on master.

  • Merge to master.

Release branch picture

Release branch

OneFlow: Hotfix branch

  • For critical defect solutions.

  • Start from last version tag.

  • Merge to master.

Hotfix branch picture

Hotfix branch