Skip to content

Gitflow model

Jump to bottom
María Galbis edited this page Mar 21, 2024 · 3 revisions

The model used to manage the git branches is GitFlow.

  • main : This branch is used to publish final releases, and as base for develop and any hotfix/ branch. Each release must be tagged properly with its version number. For each change committed to this branch, a rebase must be done on the develop branch.

  • develop : This branch is used as base for any fix/, feat/, refact/ and release/ branch.

  • fix/, feat/, refact/ : Temporary branches used to fix bugs, develop new features, and make code refactor, respectively. They must be created from develop and merged back and deleted.

  • release/vX.X.X : Temporary branches where to apply final adjustments prior publishing a new release. They must be created from develop, and merged to main and deleted once they are ready.

  • hotfix/ : Temporary branches used to fix critical bugs of a previously published release. They msut be created from main, and merged back and deleted.

Below there is a diagram representing the flow:

wakamiti-gitflow

Clone this wiki locally