Git flow process - Gapminder/dollar-street-framework GitHub Wiki

When it is time to make a new feature or release, a release branch is created from the development and named "release-[version]"

The developer creates a new branch based on "release" and names it Branch name guide. When development is finished, the branch is merged with the 'release' branch.

The code in the release branch is automatically deployed onto the 'release-ds' project on GCP without 'CMS' instance, tested, and any problems are fixed in a new branch and is merged into "release". This cycle continues until you’re happy that the release is good enough.

When the release is finished, the release branch is merged into development and automatically deployed onto the 'dev-ds' without 'CMS' instance.

When code had checked in the development branch, the development branch can be merged into master. The "Prod" is deployed manually Deploy from local

In the development should be merged only "release" branches and in the master should be merged only the development branch.