Skip to content

GIT BRANCH CONVENTION

sunjh96 edited this page Jan 30, 2023 · 2 revisions

Branch Convention

Branch Name

  • main: ๊ธฐ์ค€์ด ๋˜๋Š” ๋ธŒ๋žœ์น˜, ๋ฐฐํฌ ๋ฒ„์ „๊ณผ ์ผ์น˜ํ•˜๋„๋ก ๊ด€๋ฆฌ
  • dev: ๋‹ค์Œ ๋ฒ„์ „์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
  • feature: ๋‹จ์œ„ ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜(๋„ค์ด๋ฐ: FE-feature/ or BE-feature/: ๊ธฐ๋Šฅ๋ช…), ๊ตฌํ˜„ ์™„๋ฃŒ ์‹œ dev๋กœ merge(์–‘์‹: #์ด์Šˆ๋ณ€ํ˜ธ-๊ธฐ๋Šฅ๋ช…)

Git Flow

  • main ๋ธŒ๋žœ์น˜์—์„œ dev ๋ธŒ๋žœ์น˜ ๋ถ„๊ธฐ
  • feature ๋ธŒ๋žœ์น˜์—์„œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ํ›„ dev ๋ธŒ๋žœ์น˜์— PR ์ž‘์„ฑ
  • dev ๋ธŒ๋žœ์น˜๋Š” ๊ฐœ๋ฐœ์„œ๋ฒ„์—์„œ ํ…Œ์ŠคํŠธ
  • ๊ธฐ๋Šฅ ๊ตฌํ˜„์ด ์žˆ๋Š” ๊ฒฝ์šฐ, dev ๋ธŒ๋žœ์น˜์—์„œ feature ๋ธŒ๋žœ์น˜ ๋ถ„๊ธฐ
  • ๋ฐฐํฌ ํ›„ ๋ฒ„์ „์€ ํƒœ๊ทธ๋ฅผ ์ด์šฉํ•ด ์ €์žฅ
Clone this wiki locally