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 ์ฟผ๋ฆฌ ์ตœ์ ํ™” ๋“ฑ์œผ๋กœ ์ธํ•œ ์„ฑ๋Šฅ ๊ฐœ์„