Skip to content

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 쿼리 μ΅œμ ν™” λ“±μœΌλ‘œ μΈν•œ μ„±λŠ₯ 개μ„