GitFlow

Jump to bottom

Kevin Parra edited this page Nov 2, 2023 · 1 revision

The general Gitflow is as follows:

A master branch is created from main.
A release branch is created from master.
Feature branches are created from master.
When a feature branch is finished, it merges into master.
When the release branch is ready, it merges into both master and main.
If a problem is detected in main, a hotfix branch is created from main.
Once the hotfix branch is finished, it merges into both master and main.