[WEB] Git Flow

yayaya_hojinยท2024๋…„ 2์›” 3์ผ

WEB

๋ชฉ๋ก ๋ณด๊ธฐ
16/16
post-thumbnail

๐ŸŒŸ Git Flow

Git Flow๋Š” Git์„ ์ด์šฉํ•ด์„œ ๋ธŒ๋žœ์น˜๋ฅผ ๋ถ„๋ฆฌํ•ด์„œ ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜ ์ „๋žต์ด๋‹ค.

โ›“๏ธ Git Flow ๋ธŒ๋žœ์น˜ ์ข…๋ฅ˜ ๋ฐ ํŠน์ง•

main: ์„œ๋น„์Šค๋ฅผ ๋ฐฐํฌํ•˜๋Š” ๋ธŒ๋žœ์น˜

release: ๋ฐฐํฌํ•˜๊ธฐ ์ด์ „์— QA๋ฅผ ํ•˜๋Š” ๋ธŒ๋žœ์น˜

feature: ๊ฐ ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜

develop: feature๋ฅผ ํ†ตํ•ด ๊ฐœ๋ฐœํ•œ ๋‚ด์šฉ์„ ์ €์žฅํ•˜๋Š” ๋ธŒ๋žœ์น˜

hotfix: ๋ฐฐํฌํ•˜๋ฉด์„œ ๋ฐœ์ƒํ•œ ๋ฒ„๊ทธ ์ˆ˜์ • ๋ธŒ๋žœ์น˜

โš™๏ธ Git Flow ์ง„ํ–‰ ๊ณผ์ •

git_img

1) ํŒ€์›๋“ค ๊ฐœ์ธ์ด ๊ฐœ๋ณ„์ ์œผ๋กœ feature ๋ธŒ๋žœ์น˜์—์„œ ๊ฐœ๋ฐœ์„ ํ•œ ๋’ค develop ๋ธŒ๋žœ์น˜๋กœ merge

2) ๋ชจ๋“  ๊ธฐ๋Šฅ์ด ์™„๋ฃŒ๋˜๋ฉด develop ๋ธŒ๋žœ์น˜๋ฅผ release ๋ธŒ๋žœ์น˜๋กœ merge

3) release ๋ธŒ๋žœ์น˜์—์„œ QA(ํ’ˆ์งˆ ๊ฒ€์‚ฌ)๋ฅผ ํ†ตํ•ด ๋ฒ„๊ทธ ์ˆ˜์ • ๋ฐ ํ…Œ์ŠคํŠธ ์‹ค์‹œ

4) ํ…Œ์ŠคํŠธ ํ†ต๊ณผ ํ›„ release ๋ธŒ๋žœ์น˜๋ฅผ main ๋ธŒ๋žœ์น˜๋กœ merge

5) ๋ฐฐํฌ ํ›„ ๋ฒ„๊ทธ๊ฐ€ ๋ฐœ์ƒํ•ด์„œ ์ˆ˜์ •์ด ํ•„์š”ํ•˜๋ฉด hotfix ๋ธŒ๋žœ์น˜์—์„œ ์ˆ˜์ • ํ›„ ๋‹ค์‹œ main ๋ธŒ๋žœ์น˜๋กœ merge

โ— Git Flow ์žฅ๋‹จ์ 

๐Ÿ‘ ์žฅ์ 

  • ๋ธŒ๋žœ์น˜๋งˆ๋‹ค ์—ญํ• ์ด ๋ช…ํ™•ํ•˜๋‹ค.
  • ๋‹ค๋ฅธ ์‚ฌ๋žŒ์˜ ๊ฐœ๋ฐœ ๊ฒฐ๊ณผ์— ์˜ํ–ฅ์„ ๋ฐ›์ง€ ์•Š๋Š” ๋…๋ฆฝ์  ๊ฐœ๋ฐœ ํ™˜๊ฒฝ ์กฐ์„ฑ์ด ๊ฐ€๋Šฅํ•˜๋‹ค.
  • ๋ฐฐํฌ ๋ฐ ํ…Œ์ŠคํŠธ์— ์šฉ์ดํ•˜๋‹ค.

๐Ÿ‘Ž ๋‹จ์ 

  • ๋งŽ์€ ๋ธŒ๋žœ์น˜๋ฅผ ๊ด€๋ฆฌํ•จ์œผ๋กœ์จ ์ƒ๊ธฐ๋Š” ๋ณต์žกํ•œ ๊ทœ์น™์ด ์กด์žฌํ•œ๋‹ค.

0๊ฐœ์˜ ๋Œ“๊ธ€