Aeroporto di Bologna - Design System

Development & workflow

GIT Project Branches

Name Branch Websites
sito18 prod master http://adb.tangible.is/
sito18 dev development http://adb-dev.tangible.is/
sito22 restyle http://adb22.tangible.is/
sito22 dev restyle22/development http://adb22-dev.tangible.is/

Branch naming

  • restyle22/issue-XXXX - features specific for restyling adb22
  • feature/issue-XXXX - new features and bug fixes
  • hotfix/issue-XXXX - urgent fixes
  • NB: XXXX is the same number as the corresponding issue on bitbucket

Workflow

  • We delivery to Endurance using develop or feature specific branches

  • The restyling branch restyle remains isolated until completion, after that it will become a regular branch and will be merged into develop and master

Git Flow metodology

The overall flow of Gitflow is

  1. A development branch is created from `master
  2. Feature branches are created from development
  3. When a feature is complete it is merged into both development and master
  4. If an issue in master is detected a hotfix branch is created from master
  5. Once the hotfix is complete it is merged to both development and master
  6. Feature for Restyle22 are merged into restyle branch
  7. restyle branch will remain unmerged until we decide to release it