Skip to content

Git flow description

We starts with one long living branch for environment:

  • dev: main branch for starting feature branches
  • stg: branch for staging environment where dev is merged when feature ready
  • prd: branch for staging environment where stg is 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"