-
Notifications
You must be signed in to change notification settings - Fork 4
Git Branch μ λ΅
Jiwon Lee edited this page Jul 12, 2023
·
6 revisions
| branch | description | example |
|---|---|---|
| develop-client | νλ‘ νΈμλ κ°λ° μλ² | - |
| develop-backend | λ°±μλ κ°λ° μλ² | - |
| feature/{issue_number} | μλ‘μ΄ κΈ°λ₯ | feature/CK-1 |
| fix/{issue_number} | betaμμ λ°μν μ€λ₯ μμ μ©λ, μ€λ₯ λ°μ μ νμ μ΄μ λ°ν ν ν λΉ | fix/CK-10 |
| beta | develop-client, develop-backend 1μ°¨ merge | fix/CK-10 |
| hotfix/{issue_number} | νλ‘λμ μλ²μμ λ°μν μ€λ₯ μμ , μ€λ₯ λ°μ μ νμ μ΄μ λ°ν ν ν λΉ | hotfix/CK-10 |
| release | λ°±μλ, νλ‘ νΈμλ νλ‘λμ μλ² λ°°ν¬ | - |
| main | μ΅μ’ μ μΌλ‘ λ°±μλ + νλ‘ νΈμλ μ½λ λ³ν© (only Repository) | - |
π― release ν νμ νκ·Έλ‘ λ²μ κ΄λ¦¬νκΈ°
- 0.0.1 β 0.0.2 (patch version): hotfix μμ , refactoring
- 0.1 β 0.2 (minor version): μ¬μ©μ μ μ₯μμ μλ‘μ΄ κΈ°λ₯ μΆκ°
- 0.1 β 1.0 (major version): νμ λ²μ κ³Ό νΈνλμ§ μμΌλ©΄μ μ¬μ©μ μ μ₯μμ μμ²λ λ³νκ° λ°μνμ λ
π μ μμ¬ν
- develop-backend / develop-clientλ‘ κ° featureμ λν νλ³ PR -> merge μ§ν
- developμ μμ μ±μ΄ 보μ₯λλ©΄ betaλ‘ 1μ°¨ merge
- betaμμ λ°μν μ€λ₯λ μ΄μ ν λΉ ν fix/{issue_number} λΈλμΉλ₯Ό ν΅ν΄ μμ ν PR -> merge
- betaμ μμ μ±μ΄ 보μ₯λλ©΄ releaseλ‘ 2μ°¨ merge
- releaseμμ λ°μν μ€λ₯λ μ΄μ ν λΉ ν hotfix-{issue_number}λ‘ μμ ν PR -> merge
- release μμ μ± λ³΄μ₯ μ λ²μ λ³ κ΄λ¦¬ μ§ν
| name | description |
|---|---|
| feat | μλ‘μ΄ κΈ°λ₯ κ°λ°, κΈ°μ‘΄ κΈ°λ₯μ μ μ± λ³κ²½, νκΈλ‘ μμ±νκΈ° |
| fix | λ²κ·Έ μμ |
| docs | λ¬Έμ μμ |
| build | dependency μΆκ° |
| refactor | ν μ€νΈ μ½λλ κ·Έλλ‘ λμκ°λλ° μ½λ νμμ΄ λ³κ²½λκ±°λ, 리ν©ν°λ§ μ§ν |
| style | λ©μλμ μμΉλ 곡백 μμ |
| test | ν μ€νΈ μ½λ μΆκ°, ν μ€νΈ μ½λ 리ν©ν°λ§ μΆκ° |
| chore | μ€μ νμΌμ΄ λ³κ²½λμμ λ, docker, nginx κ°μ μΈλΆ μ€μ νμΌμ΄ μΆκ°λκ±°λ λ³κ²½λμμ λ |
| perf | 쿼리 μ΅μ ν λ±μΌλ‘ μΈν μ±λ₯ κ°μ |