Skip to content

Git Branch Strategy

lee-3-8 edited this page Nov 2, 2021 · 7 revisions

๊นƒ ๋ธŒ๋žœ์น˜ ์ „๋žต

  • ๋งค์ฃผ ๋ชฉ์š”์ผ ๋ฐฐํฌ ๋ฒ„์ „์„ ํ…Œ์ŠคํŠธํ•˜๊ณ  master ๋ธŒ๋žœ์น˜์— pr ํ›„ merge
  • ๊ฐ ์ฃผ์ฐจ ๋ณ„๋กœ master์— pr์‹œ week1 ์ฒ˜๋Ÿผ ์ปค๋ฐ‹์— Lightweight ํƒœ๊ทธ๋ฅผ ๋ถ™์ธ๋‹ค.
  • ์ฐธ๊ณ  ๋งํฌ - git tag
  1. ๊ฐ ํŒ€์›์€ repository๋ฅผ fork๋ฅผ ํ•œ๋‹ค.
  2. upstream master์—์„œ dev branch๋ฅผ ์ƒ์„ฑํ•œ๋‹ค.
  3. fork๋œ ๋ ˆํฌ์—์„œ ๋ณธ์ธ ์ด ๊ฐœ๋ฐœํ•  feature branch๋ฅผ ์ƒ์„ฑํ•œ๋‹ค.
  4. ๊ฐœ๋ฐœ์ด ์™„๋ฃŒ๋˜๋ฉด upstream dev branch์— Pull request๋ฅผ ๋ณด๋‚ธ๋‹ค.
  5. ์ฝ”๋“œ๋ฆฌ๋ทฐ ๋ฐ pr ๊ฒ€ํ† ๊ฐ€ ์™„๋ฃŒ๋˜๋ฉด merge๋ฅผ ์ˆ˜ํ–‰ํ•œ๋‹ค.
  6. upstream dev์™€ origin dev๋ฅผ ๋™๊ธฐํ™”ํ•œ๋‹ค.
  7. 2-5๋ฅผ ๋ฐ˜๋ณตํ•œ๋‹ค.
  8. ๋งค์ฃผ ๋ชฉ์š”์ผ ์Šคํ”„๋ฆฐํŠธ๊ฐ€ ์ข…๋ฃŒ๋˜๋ฉด ํ…Œ์ŠคํŠธ๋ฅผ ๊ฑฐ์ณ upstream dev์—์„œ master branch์— merge ํ›„ ๋ฐฐํฌํ•œ๋‹ค.

๊ทธ๋ผ์šด๋“œ ๋ฃฐ

๊ธฐํš

์ปจ๋ฒค์…˜

์Šคํ”„๋ฆฐํŠธ

weeks

์ฃผ๊ฐ„ ํšŒ๊ณ ๋ก

weeks

ํ”ผ์–ด ์„ธ์…˜

weeks

๋ฐ์ผ๋ฆฌ ์Šคํฌ๋Ÿผ

1์ฃผ์ฐจ
2์ฃผ์ฐจ
3์ฃผ์ฐจ
4์ฃผ์ฐจ
5์ฃผ์ฐจ
6์ฃผ์ฐจ

๋ฐ๋ชจ ์˜์ƒ

weeks
Clone this wiki locally