Gitflow

Git flow pattern practices

First of all, we have the master branch, which contains the code that is currently in production. No developer is working directly on it.
From this master branch, we create a develop branch, which is the branch that will contain the changes to be deployed in the next delivery of the application.
For each of the application's functionalities, a feature/ branch is created (the / will hence create a feature directory) from the develop branch.
As soon as a feature is finished being coded, the branch of the feature is merged into the develop branch.
Then, as soon as we want to deploy all of the latest features developed, we create a release branch from develop.
The release branch content is deployed in all environments successively.
As soon as the deployment in production has taken place, the release branch is merged with the master branch, and, with this merge operation, the master branch contains the production code. Hence, the code that is on the release branch and features branch is no longer necessary, and these branches can be deleted.
If a bug is detected in production, we create a hotfix/ branch; then once the bug is fixed, we merge this branch into the master and develop branches to propagate the fix on the next branches and deployments.

References

Last updated 3 years ago