Skip to content

Git Branch ์ „๋žต

์ค€ํŒ(junpak) edited this page Jul 12, 2023 · 1 revision

image

๋ธŒ๋žœ์น˜ ์—ญํ•  ๊ทœ์น™
main ์šด์˜ ์„œ๋ฒ„ ๋ฐฐํฌ - ์šด์˜ ์„œ๋ฒ„์— ๋ฐฐํฌ๋˜๋Š” branch
- develop branch์—์„œ QA๊ฐ€ ์™„๋ฃŒ๋œ ๊ฒฝ์šฐ๋งŒ merge
- ์‚ญ์ œํ•˜์ง€ ์•Š๋Š”๋‹ค.
develop ๊ฐœ๋ฐœ ์„œ๋ฒ„ ๋ฐฐํฌ - ๊ฐœ๋ฐœ ์„œ๋ฒ„์— ๋ฐฐํฌ๋˜๋Š” branch
- feat branch์˜ ๊ธฐ๋Šฅ๋“ค์ด ํ•ฉ์ณ์ง€๋Š” branch
- mergeํ•  ๋•Œ, squash mergeํ•œ๋‹ค.
- ์‚ญ์ œํ•˜์ง€ ์•Š๋Š”๋‹ค.
feat ์‹ ๊ทœ ๊ธฐ๋Šฅ ์ถ”๊ฐ€ - Issue๋ณ„ ๊ธฐ๋Šฅ ๋‹จ์œ„๋กœ ์ƒ์„ฑ๋˜๋Š” branch
- develop branch์—์„œ ์ƒ์„ฑ
- merge๊ฐ€ ๋œ ๊ฒฝ์šฐ ์‚ญ์ œํ•œ๋‹ค.
hotfix ๊ธด๊ธ‰ํ•œ ๋ฒ„๊ทธ ๋ฐ ์—๋Ÿฌ ์ˆ˜์ • - ์ตœ์‹  main branch์—์„œ ์ƒ์„ฑ
- main branch์— ์šฐ์„ ์ ์œผ๋กœ merge ํ›„, develop branch์—๋„ mergeํ•œ๋‹ค.
  • ์šด์˜์„œ๋ฒ„์— ๋ฐฐํฌํ•˜๊ธฐ ์ „๊นŒ์ง€๋Š” main branch๋ฅผ ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š”๋‹ค. (github flow ์ „๋žต)