Skip to content

๐Ÿ“ˆGitHub Rule

๋…ธํ˜„์ง„ edited this page Oct 29, 2024 · 2 revisions

๐Ÿ“” Git Branch Rule

web12_git_branch_rule drawio (1)

Branch Description Naming Examples CI/CD
main ์ถœ์‹œ ๊ฐ€๋Šฅํ•œ ํ”„๋กœ๋•์…˜ ์ฝ”๋“œ๋ฅผ ๋ชจ์•„๋‘๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. ๋ฐฐํฌ๋œ ๊ฐ ๋ฒ„์ „์„ Tag๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ํ‘œ์‹œํ•ด๋‘ก๋‹ˆ๋‹ค. Tag Naming์€ v1.0.1๊ณผ ๊ฐ™์ด ํ‘œ์‹œํ•ฉ๋‹ˆ๋‹ค. v1.0.1 develop ๋ธŒ๋žœ์น˜์—์„œ main ๋ธŒ๋žœ์น˜๋กœ merge ์‹œ ์ ์šฉ
develop ๋‹ค์Œ ๋ฒ„์ „ ๊ฐœ๋ฐœ์„ ์œ„ํ•œ ์ฝ”๋“œ๋ฅผ ๋ชจ์•„๋‘๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋œ ๊ฒฝ์šฐ main ๋ธŒ๋žœ์น˜๋กœ merge ํ•ฉ๋‹ˆ๋‹ค. ย  ย 
FE_develop ๋‹ค์Œ ๋ฒ„์ „ ๊ฐœ๋ฐœ๊ณผ ๊ด€๋ จํ•ด์„œ Front-end ์ฝ”๋“œ๋ฅผ ๋ชจ์•„๋‘๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. develop ๋ธŒ๋žœ์น˜์—์„œ ์ƒ์„ฑํ•˜๋ฉฐ, ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋œ ๊ฒฝ์šฐ develop ๋ธŒ๋žœ์น˜๋กœ merge ํ•ฉ๋‹ˆ๋‹ค. ย  FE_feature ๋ธŒ๋žœ์น˜์—์„œ FE_develop ๋ธŒ๋žœ์น˜๋กœ merge ์‹œ FE ์ฝ”๋“œ์— ๋Œ€ํ•ด์„œ ์ ์šฉ
FE_feature/๊ธฐ๋Šฅ ํ•˜๋‚˜์˜ Front-end ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๊ธฐ ์œ„ํ•ด ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. FE_develop ๋ธŒ๋žœ์น˜์—์„œ ์ƒ์„ฑํ•˜๋ฉฐ, ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋  ๊ฒฝ์šฐ FE_develop ๋ธŒ๋žœ์น˜์— mergeํ•ฉ๋‹ˆ๋‹ค. FE_feature/login ย 
BE_develop ๋‹ค์Œ ๋ฒ„์ „ ๊ฐœ๋ฐœ๊ณผ ๊ด€๋ จํ•ด์„œ Back-end ์ฝ”๋“œ๋ฅผ ๋ชจ์•„๋‘๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. develop ๋ธŒ๋žœ์น˜์—์„œ ์ƒ์„ฑํ•˜๋ฉฐ, ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋œ ๊ฒฝ์šฐ develop ๋ธŒ๋žœ์น˜๋กœ merge ํ•ฉ๋‹ˆ๋‹ค. BE_feature/login BE_feature ๋ธŒ๋žœ์น˜์—์„œ BE_develop ๋ธŒ๋žœ์น˜๋กœ merge ์‹œ BE ์ฝ”๋“œ์— ๋Œ€ํ•ด ์ ์šฉ
BE_feature/๊ธฐ๋Šฅ ํ•˜๋‚˜์˜ Back-end ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๊ธฐ ์œ„ํ•ด ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜์ž…๋‹ˆ๋‹ค. BE_develop ๋ธŒ๋žœ์น˜์—์„œ ์ƒ์„ฑํ•˜๋ฉฐ, ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋  ๊ฒฝ์šฐ BE_develop ๋ธŒ๋žœ์น˜์— mergeํ•ฉ๋‹ˆ๋‹ค. ย  ย 
hotfix/๊ธฐ๋Šฅ ์ด๋ฏธ ๋ฐฐํฌ๋œ ๋ฒ„์ „์— ๋ฌธ์ œ๊ฐ€ ๋ฐœ์ƒํ–ˆ์„ ๋•Œ, ํ•ด๋‹น ๋ธŒ๋žœ์น˜๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ๋ฌธ์ œ๋ฅผ ํ•ด๊ฒฐํ•ฉ๋‹ˆ๋‹ค. main ๋ธŒ๋žœ์น˜์—์„œ ์ƒ์„ฑํ•˜๋ฉฐ, ๋ฌธ์ œ๊ฐ€ ํ•ด๊ฒฐ๋  ๊ฒฝ์šฐ main ๋ธŒ๋žœ์น˜์™€ develop ๋ธŒ๋žœ์น˜์— mergeํ•ฉ๋‹ˆ๋‹ค. hotfix/login ย 

๐Ÿ’ฌ Git Commit Message Rule

ํƒœ๊ทธ ์ด๋ฆ„ ์„ค๋ช…
feat ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•œ ๊ฒฝ์šฐ
fix ๋ฒ„๊ทธ๋ฅผ ๊ณ ์นœ ๊ฒฝ์šฐ
ui UI ๊ด€๋ จ ์ž‘์—…์„ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ
refactor ๊ธฐ๋Šฅ ๋ณ€๊ฒฝ ์—†์ด ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง์„ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ
comment ์ฃผ์„์„ ์ž‘์„ฑํ•˜๊ฑฐ๋‚˜ ๋ณ€๊ฒฝํ•œ ๊ฒฝ์šฐ
docs ๋ฌธ์„œ๋ฅผ ์ถ”๊ฐ€ํ•˜๊ฑฐ๋‚˜, ์‚ญ์ œ, ๋˜๋Š” ๋ณ€๊ฒฝํ•œ ๊ฒฝ์šฐ
test ํ…Œ์ŠคํŠธ๋ฅผ ์ถ”๊ฐ€ํ•˜๊ฑฐ๋‚˜ ํ…Œ์ŠคํŠธ ๋ฆฌํŒฉํ† ๋ง์„ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ (ํ”„๋กœ๋•์…˜ ์ฝ”๋“œ ๋ณ€๊ฒฝ X)
chore ๋นŒ๋“œ ์„ค์ •, ์˜์กด์„ฑ ์—…๋ฐ์ดํŠธ ๋“ฑ์˜ ์‚ฌ์†Œํ•œ ์ž‘์—…์„ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ
rename ํŒŒ์ผ ๋˜๋Š” ํด๋”๋ช…์„ ์ˆ˜์ •ํ•˜๊ฑฐ๋‚˜ ํŒŒ์ผ์„ ์˜ฎ๊ธฐ๋Š” ์ž‘์—…์„ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ
remove ํŒŒ์ผ ๋˜๋Š” ํด๋”๋ฅผ ์‚ญ์ œํ•œ ๊ฒฝ์šฐ

MafiaCamp

๐Ÿ“”์†Œ๊ฐœ
๐ŸŽฏํ”„๋กœ์ ํŠธ ๊ทœ์น™
๐Ÿ’ปํ”„๋กœ์ ํŠธ ๊ธฐํš
๐Ÿ€๊ธฐ์ˆ  ์Šคํƒ
๐Ÿ“š๊ทธ๋ฃน ํšŒ๊ณ 
๐ŸŒˆ๊ฐœ๋ฐœ ์ผ์ง€
๐Ÿ€๋ฌธ์ œ ํ•ด๊ฒฐ ๊ฒฝํ—˜
๐Ÿ”งํŠธ๋Ÿฌ๋ธ” ์ŠˆํŒ…
Clone this wiki locally