Workflow

Git

The master branch has to be in a runnable state at any time.

• A develop branch is created from master
• A release branch is created from develop > When the release branch is done it is merged into develop and master.
• A feature branch is created from develop > When a feature is complete it is merged into the develop branch.

If an issue in master is detected a hotfix branch is created from master, once the hotfix is complete it is merged to both develop and master.

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow