Branch Strategy - pie-sfac/1-16-careMango GitHub Wiki

Branch Strategy

github-flow strategy (custom) ๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

๐ŸŒณ Branch List

  • main : ์ถœ์‹œํ•  ๋ธŒ๋žœ์น˜
    • hotfix : ๋ฒ„๊ทธ ์ˆ˜์ • ๋ธŒ๋žœ์น˜ (main๊นŒ์ง€ ๋‹ค ๋จธ์ง€๊ฐ€ ๋œ ์ƒํƒœ์—์„œ ๋ฐœ๊ฒฌ๋œ ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ •ํ•˜๋Š” ์šฉ๋„)
  • develop : ๋‹ค์Œ ์ถœ์‹œ ๋ฒ„์ „ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
    • feature : ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
    • bug : ์ด์Šˆ๊ฐ€ ๋‹ซํžŒ ๊ธฐ๋Šฅ์— ๋Œ€ํ•ด ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ •ํ•  ๊ฒฝ์šฐ ํ•ด๋‹น ๋ธŒ๋žœ์น˜์—์„œ bug ๋ธŒ๋žœ์น˜ ์ƒ์„ฑํ•˜์—ฌ ์ž‘์—…
    • refactor : ์ด์Šˆ๊ฐ€ ๋‹ซํžŒ ๊ธฐ๋Šฅ์— ๋Œ€ํ•ด ๋ฆฌํŒฉํ„ฐ๋ง์„ ํ•  ๊ฒฝ์šฐ ํ•ด๋‹น ๋ธŒ๋žœ์น˜์—์„œ refactor ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•˜์—ฌ ์ž‘์—…

main โ†’ develop โ†’ feature

๐ŸŒฟ Branch Name Format

develop โ†’ {branchType}/#{issueNum}

โœ… feature/#20, refactor/#77 โ›”๏ธ bug/๋ฒ„๊ทธํ•ด๊ฒฐ, feature/20