Git flow description¶
We starts with one long living branch for environment:
dev: main branch for starting feature branchesstg: branch for staging environment wheredevis merged when feature readyprd: branch for staging environment wherestgis merged when release is ready
gitGraph
commit id: "Initial commit"
branch dev
commit id: "Dev work"
branch stg
commit id: "Staging baseline"
branch prd
commit id: "Production baseline"
checkout dev
branch feature/new-feature
commit id: "Feature development"
commit id: "Feature completed"
checkout dev
merge feature/new-feature tag: "Merge feature into dev"
checkout stg
merge dev tag: "Sync dev -> stg"
checkout dev
merge stg tag: "Sync stg -> dev"
commit id: "More dev work"
%% Release is finished
checkout prd
merge stg tag: "Release to production (stg -> prd)"
checkout stg
merge prd tag: "Sync prd -> stg"
checkout dev
merge stg tag: "Sync stg -> dev"