Skip to content

Git Branch Rule

SeoSeunghun edited this page Aug 20, 2023 · 2 revisions

Git Branch Rule

git flow ์ „๋žต์„ ์‚ฌ์šฉํ•ด์„œ ๊ฐ branch๋ฅผ ๊ด€๋ฆฌํ•œ๋‹ค.

Branch Rule

  • main : ์ œํ’ˆ์œผ๋กœ ์ถœ์‹œ๋  ์ˆ˜ ์žˆ๋Š” ๋ธŒ๋žœ์น˜
  • develop : ๋‹ค์Œ ๋ฐฐํฌ๋ฅผ ์œ„ํ•ด ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
  • base : ์ด์Šˆ๋ฅผ ํ•ด๊ฒฐํ•˜๋Š” ๊ธฐ๋Šฅ์„ ๊ตฌํ˜„ํ•ด ํ•ฉ์น  ๋ธŒ๋žœ์น˜, ๊ฐ์ž์˜ ID์™€ ๋‹ด๋‹นํ•  ์ด์Šˆ ๋ฒˆํ˜ธ๋ฅผ ๋ช…์‹œํ•œ๋‹ค.
    • ${username}/base-${issue number}
    • ex) grolarkim/base-#123
  • feature : ๊ฐ ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜, ๊ฐ์ž์˜ ID์™€ ๋‹ด๋‹นํ•œ ์ด์Šˆ ๋ฒˆํ˜ธ, ๊ฐœ๋ฐœํ•  ๊ธฐ๋Šฅ์„ ๋ช…์‹œํ•œ๋‹ค.
    • ${username}/${type}-${issue number}-${feature details}
    • ex) protoseo/refactor-#111-cicd-template

Details Rule

  • ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ค๊ธฐ ์ „์—, Issue๋ฅผ ๊ฐ์ž ํ• ๋‹นํ•œ๋‹ค.
  • develop ๋ธŒ๋žœ์น˜๋กœ ๊ฐ€๊ธฐ ์œ„ํ•ด์„œ๋Š” base ๋ธŒ๋žœ์น˜๋ฅผ ๊ฑฐ์ณ์•ผ ํ•œ๋‹ค.

์™œ Git flow ๋ฅผ ์‚ฌ์šฉํ•˜๊ฒŒ ๋˜์—ˆ์„๊นŒ?

์„œ๋กœ ํ˜‘์—…์„ ์ง„ํ–‰ํ•˜๋ฉด์„œ, ์„œ๋กœ์˜ ๋…๋ฆฝ์ ์ธ ๊ฐœ๋ฐœ ํ™˜๊ฒฝ์„ ๋ณด์žฅํ•˜๊ธฐ ์œ„ํ•ด์„œ Git flow๋ฅผ ์‚ฌ์šฉํ•˜์˜€๋‹ค.

Clone this wiki locally