Skip to content

Branching and releases

AUBY Khan edited this page Dec 15, 2019 · 1 revision
  • local-master is live branch and is locked
  • prod branch is stable and intended for production releases. It's locked as well.
  • Branch name will follow kebab-case scheme
  • All feature and bugfix branches are taken out from local-master
  • feature and bugfix branches are squash merged into local-master after:
    • It's dev-tested
    • Have a non-hacked solution
    • It's done against an open issue
    • Have good code quality
  • local-master is periodically rolled into prod through fast-forward merges
  • hotfix-* branches are taken out from prod if absolutely required
  • hotfix-* branches will only contain cherry-picked code from local-master
Clone this wiki locally