GitFlow - lopspower/CleanRxArchitecture GitHub Wiki

Basic Gitflow:

Prefix all of your branche created from develop with:

  • feature/branch_name: when you develop new feature
  • evol/branch_name: when you change a current feature
  • fix/branch_name: when you fix a bug
  • support/branch_name: when you update dependencies or refactoring code

And after your squash, add the same code name on your commit like this: [FEATURE] description

:warning: Don't forget to use no fast forward option if you don't use Merge Request (MR) or Pull to Request (PR) to force commit merge and keep a clean git flow.

Hotfix: