Repository navigation
General Branches
On this page, you'll find references for the following topics in the given sections:
For this project, general branches will be the major branches.
There will be 2 general branches:
- Dev
- Prod
Dev branch has the goal to be the branches where we will push feature and "work in progress" features.
Prod branch has the goal to be a fully functional branch, this code must always be ready to be merged to master.
There is a visual representation of Dev Prod and Master.
Since this project has 3 sides:
- Web Front
- Mobile Front
- Server
There will be one Dev & Prod Branche for each.
The goal of each Dev and Prod stay the same, but here a remainder:
Dev branch has the goal to be the branches where we will push feature and "work in progress" features.
Prod branch has the goal to be a fully functional branch, this code must always be ready to be merged to master.
Every merge must follow the following order:
- 1/ Feature branch TO Dev dedicated branch
- 2/ Dev dedicated branch TO Prod dedicated branch
- 3/ Prod dedicated branch TO GENERAL Dev
- 4/ GENERAL Dev TO GENERAL Prod
- 4/ GENERAL Prod TO Maset
Each Dev or Prod branch for the Web, Mobile, and Server side must be named as on the following visual representation
