-
Notifications
You must be signed in to change notification settings - Fork 0
CI Branching conventions
Rehan Nagoor Mohideen edited this page May 18, 2024
·
1 revision
Branching Conventions for Continuous Integration (CI):
- Main branch: The master branch should always reflect the latest and stable version of the codebase that is suitable for production.
- sprint-# branch: A development branch can be used as the main branch for each sprint and can act as the 'temporary master' throughout the development process.
-
Feature branches: Each team member can create their own feature branch for each new feature/issue they are working on based on the sprint planning. Once the feature is complete, the branch can be merged into the development branch (ie
sprint-#-setup-docker
). - Hotfix branches: In case of emergency fixes, a hotfix branch can be created from the master branch, and the fix can be integrated back into the master branch and development branch after review. This branch will contain the latest stable version of the codebase (taken from the master after at the end of each code review/start of each sprint)