Skip to content

๐Ÿค“ Git Branch ์ „๋žต

Do Hyeon Seok edited this page Sep 21, 2024 · 1 revision

Git Flow

OverClean์€ Git Flow ์ „๋žต์„ ์‚ฌ์šฉํ•˜๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค.

image

  • ์ž‘์—… ์‹œ ์„ ํ–‰๋˜์–ด์•ผ ํ•  ๊ณผ์ •์€ ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค.
1. Issue๋ฅผ ์ƒ์„ฑํ•˜์—ฌ ์ƒˆ๋กœ์šด ์ž‘์—…์„ ์‹œ์ž‘ํ•  ์ค€๋น„๋ฅผ ํ•œ๋‹ค.
2. develop branch์—์„œ feature Branch๋ฅผ ์ƒ์„ฑํ•œ๋‹ค.
3. Add - Commit - Push - Pull Request ์˜ ๊ณผ์ •์„ ๊ฑฐ์นœ๋‹ค.
4. Pull Request๊ฐ€ ์ž‘์„ฑ๋˜๋ฉด ์ž‘์„ฑ์ž ์ด์™ธ์˜ ๋‹ค๋ฅธ ํŒ€์›์ด Code Review๋ฅผ ํ•œ๋‹ค.
5. Code Review๊ฐ€ ์™„๋ฃŒ๋˜๋ฉด Pull Request ์ž‘์„ฑ์ž๊ฐ€ develop Branch๋กœ merge ํ•œ๋‹ค.
6. mergeํ›„, feature branch๋Š” ์‚ญ์ œํ•œ๋‹ค.
7. merge๋œ ์ž‘์—…์ด ์žˆ์„ ๊ฒฝ์šฐ, ๋‹ค๋ฅธ branch์—์„œ ์ž‘์—…์„ ์ง„ํ–‰ ์ค‘์ด๋˜ ๊ฐœ๋ฐœ์ž๋Š” ๋ณธ์ธ์˜ ๋ธŒ๋žœ์น˜๋กœ merge๋œ ์ž‘์—…์„ Pull ๋ฐ›์•„์˜จ๋‹ค.