Git Flow

The main branches active are master and develop.

Master branch keeps track of branch running in production level server.

Develop branch is the branch we fetch when we add another feature.

Develop cycle

Develop -> check out feature/some_thing_to_add -> code and test locally -> git merge feature/something_to_add to develop -> checkout deploy/YYYYMMDD -> deploy to Dev Server->QA -> fix deploy/YYYYMMDD -> QA done -> merge deploy/YYYYMMDD to develop and master -> deploy production server

Hotfix cycle

Master -> checkout hotfix/YYYYMMDD -> code and test locally -> git merge hotfix/YYYYMMDD to master & develop -> deploy production server