M365Con 2027 – free online conference · 11–22 Jan 2027 · 120 sessions m365con.net

Gitflow

Concept

A Git branching model published by Vincent Driessen in 2010 that uses two permanent branches, master and develop, plus feature, release and hotfix branches. It suits software that ships in numbered versions.

✦ CONCEPTGitflowM365.FM
Title graphic: Gitflow (Concept)

Description

Gitflow is a Git branching model published by Vincent Driessen in 2010. It assigns defined roles to branches so that development, release preparation and production fixes are kept apart. The model uses two permanent branches, master and develop, plus three kinds of supporting branches: feature, release and hotfix. It is intended for software that ships in numbered versions.

In the common description of the workflow, the main branch (called master in the original model) holds the official release history and is usually tagged with version numbers. The develop branch is the integration branch where finished features come together. Feature branches start from develop and are merged back into it when the work is complete. When enough features are ready for a release, a release branch is forked from develop. That branch is used for stabilization only, such as bug fixes and documentation. It is then merged into main with a tag and also merged back into develop so that the fixes are not lost. Hotfix branches fork directly from main to patch a problem in production and are merged into both main and develop.

Gitflow adds no new Git commands beyond the feature branch workflow; it only defines roles for branches. A git-flow extension exists that wraps the individual steps into shorter commands. The model fits projects with scheduled release cycles, teams that want separate release and development phases, and teams that use code review through pull requests.

There are trade-offs. Atlassian's tutorial labels Gitflow a legacy workflow that has fallen out of favor compared with trunk-based development. Long-lived branches can lead to hard merges and drift between branches, and the model is harder to combine with continuous integration and continuous delivery. Teams that deploy continuously therefore weigh these costs against the clear separation of releases that Gitflow provides.

In the Microsoft ecosystem, Gitflow comes up in discussions of source control for CI/CD. The M365.FM episode "GitHub vs Azure DevOps for Microsoft Fabric CI/CD" mentions it as an example of a strong branching strategy that helps manage development, releases and hotfixes. The episode also advises keeping separate branches for each developer or feature to avoid merge conflicts, and requiring code reviews before merging so that other team members check and approve updates. It adds that Microsoft Fabric lets users compare the content of source and target workspaces before deploying changes, which helps catch mistakes early and keeps environments consistent.

When choosing a branching model, the main decision is how releases are delivered. Gitflow suits numbered, scheduled releases with a stabilization phase. For teams that integrate and deploy frequently, the sources point to trunk-based development as the approach that has largely replaced it. In either case, the practices the episode stresses, such as isolated branches and reviewed merges, apply to how changes move through a deployment pipeline.

Overview compiled with AI from M365.FM episodes and the facts on this page. You can improve it with the edit button below.

TypeConcept

Frequently asked questions

Questions marked with AI were written with AI from the facts on this page.

What branches does Gitflow use? (AI)

Gitflow uses two permanent branches, master (or main) and develop, plus feature, release and hotfix branches. Feature branches start from develop, release branches fork from develop for stabilization, and hotfix branches fork from main to patch production.

When is Gitflow a suitable choice? (AI)

It suits software that ships in numbered versions, projects with scheduled release cycles, and teams that want separate release and development phases with pull-request review. Atlassian describes it as a legacy workflow that is harder to combine with continuous integration and delivery.

How does the M365.FM episode on Fabric CI/CD refer to Gitflow? (AI)

The episode "GitHub vs Azure DevOps for Microsoft Fabric CI/CD" names Gitflow as an example of a strong branching strategy for managing development, releases and hotfixes, alongside advice to use separate branches per feature and to require code reviews before merging.

Glossary

Community wiki

Short info above, community knowledge below: add practical tips, examples or corrections. New contributions are reviewed first; trusted members publish directly.

Experts and companies for this topic

Nobody has listed this topic yet. Add it to your profile.

Maintained by Mirko Peters (Microsoft MVP) · Last updated: