Branch Convention - be14-fin-Clover-Salad/be14-fin-Clover-Salad-BE GitHub Wiki

1. ๋ธŒ๋žœ์น˜ ์ „๋žต

๊ธฐ์กด์˜ ํ˜•์‹์€ Github Flow ๋ฅผ ๋”ฐ๋ผ ์ง„ํ–‰ํ•˜๋˜, ์šฐ๋ฆฌ ํ”„๋กœ์ ํŠธ์— ๋งž๊ฒŒ ๋ณ€ํ™˜

  • main โ†’ develop โ†’ feature/refactor/hotfix โ†’ ์ค‘๋ถ„๋ฅ˜
    • ์˜ˆ์‹œ : feature/delivery/hotfix

1 - 1. ๋ธŒ๋žœ์น˜ ๊ณ„์ธต

  1. main : ์™„์„ฑ๋œ ์„œ๋น„์Šค, ๋ฐฐํฌ ๊ฐ€๋Šฅํ•œ ์ƒํƒœ์—ฌ์•ผ ํ•œ ์ƒํƒœ. ๊ฐœ๋ฐœ์€ ๋‹ค๋ฅธ ๊ณ„์ธต์—์„œ ์ง„ํ–‰
  2. develop : ๋‹ค์Œ ๋ฒ„์ „์˜ ๋ฐฐํฌ ๋‹จ๊ณ„, main ์— ๋ฐฐํฌ๋œ ๋ฒ„์ „ ๋‹ค์Œ ์ž‘์—…์ด๋ผ๊ณ  ์ƒ๊ฐํ•˜๋ฉด๋จ
  3. feature/refactor/hotfix : ๊ฐœ๋ฐœ์€ feature/ ์ฝ”๋“œ ์ˆ˜์ •๋ฐ ๋กœ์ง ๋ณ€๊ฒฝ์€ refactor / develop์— ์˜ฌ๋ ธ๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ๋‚˜์„œ ๊ธด๊ธ‰ํ•œ ์ˆ˜์ •๊ฑด์€ hotfix
    1. ๊ทธ ํ›„ ์ค‘๋ถ„๋ฅ˜์— ๋”ฐ๋ฅธ ๋ธŒ๋žœ์น˜๋ฅผ ํŒŒ์„œ ํ•œ ๋ธŒ๋žœ์น˜์— ํ•œ pr์ด ๋˜๊ฒŒ๋”.
โš ๏ธ **GitHub.com Fallback** โš ๏ธ