Git Branching Strategy
Josh enforces to adopt the following described git branching strategy to keep every project on the same page when it comes to git branching.
We strongly recommend to keep following major branches in project
-
master -
origin/master
to be the main branch where the source code ofHEAD
always reflects a production-ready state(production deployed code), Direct push is not allowed into this branch. -
staging -
origin/staging
to be a parallel branch tomaster
branch to stage your features for QA and user acceptance testing.(staging deployed code)Note: you can also call this branch as
uat
-
develop -
origin/develop
to be a parallel branch ofmaster
branch where the source code ofHEAD
always reflects a state with the latest delivered development changes for the next release (A working copy of code for every developer)