Git Workflow - UNO998/RZ-Blog GitHub Wiki

How to contribution?

During the development process, we follow the gitflow workflow model, theory can be found here. And if you are using GitKraken, you can check this post out.

Branch Model

There are two main branches:

  • master for production.
  • dev for finished features integration.

And there are three kinds of other branch:

  • hotfix, for bug fix.
  • release, for releasing new version.
  • feature, for developing new features.

A good way to follow the naming convention of this model is using git-flow extensions or GitKraken.

Naming Convention

We use master and dev as they are. But for the other three kinds of branch, we named them using the following rules:

  • hotfix, it will be hotfix_issue-id_who-fix-it.
  • feature, it will be feature_feature-id_who-develop-it.
  • release, it will be release_version.