ใกใคใณใจใชใใใฉใณใใใก
ใฏใใใใไธใคใใคใใใญใคใใๅ
๏ผใใจใใฐใตใผใใผ๏ผใใใใจใใพใ
้็บ็จ
็ถๆณใซใใฃใฆใฏ่คๆฐๅไฝใใใๅ ดๅใใใ
QA ใใใๅฎขใใ็ขบ่ชใชใฉใ้็บ่ ไปฅๅคใฎๆน็จ
็ถๆณใซใใฃใฆใฏ่คๆฐๅไฝใใใๅ ดๅใใใ
ๆฌ็ช็จ
ๅบๆฌ็ใซไธใคใใใชใ
ๆฐๆฉ่ฝใฎๅฎ่ฃ
ใง develop
ใใฉใณใใใไฝๆใใใพใ
QA ใงใใฐใใใฃใๅ ดๅใง develop
ใใฉใณใใใไฝๆใใใพใ
ๆฌ็ชใงใใฐใใใฃใๅ ดๅใซ production
ใใฉใณใใใไฝๆใใใพใ
develop ใใฉใณใ -> feature ใใฉใณใ -> develop ใใฉใณใ
develop
ใใฉใณใใใfeature/first
ใใฉใณใใไฝๆใใfeature/first
ใงไฝๆฅญใใ commit ใใ- ไฝๆฅญใๅฎไบใใใใญใผใซใซใฎ
feature/first
ใใฉใณใใใใชใขใผใใซ push ใใ - github.com ใฎใชใใธใใชใใผใธใซ่กใใใซใชใฏใจในใใไฝๆใใ
- into
develop
fromfeature/first
- into
- ใใซใชใฏใจในใใฎใฌใใฅใผใ Reviewers ใใๅใใ
- Reviewers ใ approved ใใ
- ใใซใชใฏใจในใใใใผใธใใ
- ใใใง
develop
ใใฉใณใใ ใใใญใค ใใใใคใกใผใธ feature/first
ใใฉใณใใ delete ใใ
* d87f0c9 (origin/develop) Merge pull request #1 from hisasann/feature/first
|\
| * 361dd3f (origin/feature/first, feature/first) first commit to feature/first
|/
* a34f262 (origin/staging, origin/production, staging, production) first commit
develop ใใฉใณใ -> staging ใใฉใณใ
- github ไธใง New pull request ใใฏใชใใฏใใ
- base:
staging
ใใฉใณใ <-develop
ใใฉใณใใ้ธๆใใ - ใฟใคใใซใใณใกใณใใๆธใ
- Create pull request ใใฏใชใใฏใใ
- into
staging
fromdevelop
- into
- Merge pull request ใใฏใชใใฏใใ
- Confirm merge ใใฏใชใใฏใใ
- ใใใง
staging
ใใฉใณใใ ใใใญใค ใใใใคใกใผใธ - Branches ใง
develop
,staging
ใใฉใณใใไฟ่ญทใใฆใใใฎใงใใฉใณใใฎๅ้คใฏใงใใพใใ
staging ใใฉใณใ -> production ใใฉใณใ
- github ไธใง New pull request ใใฏใชใใฏใใ
- base:
production
ใใฉใณใ <-staging
ใใฉใณใใ้ธๆใใ - ใฟใคใใซใใณใกใณใใๆธใ
- Create pull request ใใฏใชใใฏใใ
- into
production
fromstaging
- into
- Merge pull request ใใฏใชใใฏใใ
- Confirm merge ใใฏใชใใฏใใ
- Branches ใง
develop
,staging
ใใฉใณใใไฟ่ญทใใฆใใใฎใงใใฉใณใใฎๅ้คใฏใงใใพใใ - ใใใง
production
ใใฉใณใใ ใใใญใค ใใใใคใกใผใธ - ใชใชใผในใใใใใผใธใงใณใ github ไธใงใชใชใผในไฝๆฅญใ่กใ
QA ใฏ staging
ใใฉใณใใง่กใฃใฆใใๅๆใงใ
develop ใใฉใณใ -> fix ใใฉใณใ -> develop ใใฉใณใ -> staging ใใฉใณใ
- github ใง issue ใไฝๆใใ
develop
ใใฉใณใใใfix/first
ใใฉใณใใไฝๆใใfix/first
ใงไฝๆฅญใใ commit ใใ- ไฝๆฅญใๅฎไบใใใใญใผใซใซใฎ
fix/first
ใใฉใณใใใใชใขใผใใซ push ใใ - github.com ใฎใชใใธใใชใใผใธใซ่กใใใซใชใฏใจในใใไฝๆใใ
- into
develop
fromfix/first
- into
- ใใซใชใฏใจในใใฎใฌใใฅใผใ Reviewers ใใๅใใ
- Reviewers ใ approved ใใ
- ใใซใชใฏใจในใใใใผใธใใ
- ใใใง
develop
ใใฉใณใใ ใใใญใค ใใใใคใกใผใธ fix/first
ใใฉใณใใ delete ใใ- ใใใใๅ ใฏ QA ใใๅฎขใใ็ขบ่ชใฎใใใฎใใญใผ ใๅ็ ง
production ใใฉใณใ -> develop-* ใใฉใณใ -> hotfix ใใฉใณใ -> develop-* ใใฉใณใ -> staging-* ใใฉใณใ -> production ใใฉใณใ
- github ใง issue ใไฝๆใใ
production
ใใฉใณใใใdevelop-hotfix-XXX
ใใฉใณใใไฝๆใใ- ใญใผใซใซใฎ
develop-hotfix-XXX
ใใฉใณใใใใชใขใผใใซ push ใใ - ใใใง
develop-hotfix-XXX
ใใฉใณใใ ใใใญใค ใใใใคใกใผใธ
develop-hotfix-XXX
ใใฉใณใใจใใฆใใฎใฏใ develop
ใใฉใณใใใใงใซๆฐ่ฆ้็บใง commit ใ้ฒใใงใใใจๆณๅฎใใๅ ดๅใฎๅฝๅใงใ
ไธๆ็ใซ develop
ใตใผใใผใฏใ develop-hotfix-XXX
ใใฉใณใใใใใญใคใใใๆณๅฎใงใ
develop
ใตใผใใผใงๆฌ็ชใฎใใฐใ็บ็ใใใใ็ขบ่ชใใ- ๅ็พใใๅ ดๅใ
develop-hotfix-XXX
ใใฉใณใใใhotfix/first
ใใฉใณใใไฝๆใใ hotfix/first
ใงไฝๆฅญใใ commit ใใ- ไฝๆฅญใๅฎไบใใใใญใผใซใซใฎ
hotfix/first
ใใฉใณใใใใชใขใผใใซ push ใใ - github.com ใฎใชใใธใใชใใผใธใซ่กใใใซใชใฏใจในใใไฝๆใใ
- into
develop-hotfix-XXX
fromhotfix/first
- into
- ใใซใชใฏใจในใใฎใฌใใฅใผใ Reviewers ใใๅใใ
- Reviewers ใ approved ใใ
- ใใซใชใฏใจในใใใใผใธใใ
- ใใใง
develop-hotfix-XXX
ใใฉใณใใ ๅๅบฆใใใญใค ใใใใคใกใผใธ hotfix/first
ใใฉใณใใ delete ใใ- ใใใพใงใใใ QA ใใ QA ใใๅฎขใใ็ขบ่ชใฎใใใฎใใญใผ ใๅ็ ง
- QA ใ้ใฃใใๆฌ็ชใธ ๆฌ็ชใธใฎใใใญใคใใญใผ