Branch Strategy - DDD-Community/pregen-server GitHub Wiki

Follows git-flow

main

  • ์ถœ์‹œ ๊ฐ€๋Šฅ ๋ธŒ๋žœ์น˜
  • release ์ด๋ ฅ ๊ด€๋ฆฌ

develop

  • ์ถœ์‹œ ๋ฒ„์ „ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
  • feature ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์šฉ๋„
  • ๊ทœ์น™
    • commit, push ๊ธˆ์ง€
      • only PR
    • QA ์ข…๋ฃŒ ์‹œ, release version tag ๋ถ€์ฐฉ ๋ฐ main์— ๋ณ‘ํ•ฉ

feature

  • ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
  • ๊ทœ์น™
    • develop์œผ๋กœ๋ถ€ํ„ฐ checkout
    • ๊ธฐ๋ณธ์ ์œผ๋กœ 1 Issue - 1 Feature Branch - 1 PR ์›์น™์„ ๊ณ ์ˆ˜
      • ๊ฒฝ์šฐ์— ๋”ฐ๋ผ N Issue - 1 Feature Branch ๊ฐ€๋Šฅ
    • PR ๋จธ์ง€ ์™„๋ฃŒ ํ›„ ์‚ญ์ œ
    • ๋„ค์ด๋ฐ
      • feature/{issueโ€“number}-{description}
        • e.g., feature/8-add_presentation_api

release

  • ์ถœ์‹œ ๋ฒ„์ „ ๋ธŒ๋žœ์น˜
  • ๊ทœ์น™
    • develop์œผ๋กœ๋ถ€ํ„ฐ checkout
    • ์ด๋ฒˆ ๋ฒ„์ „์˜ ์ค€๋น„ ์ค‘์ธ ์ถœ์‹œ ๋ฒ„์ „๋งŒ ์œ ์ง€ํ•˜๋ฉฐ, ๋ฐฐํฌ ์™„๋ฃŒ ์‹œ ์‚ญ์ œ
    • ๋„ค์ด๋ฐ
      • release/{x}.{y}.{z}
        • e.g., release/2.0.4

hotfix

  • ๋ฐฐํฌ ๋ฒ„์ „์—์„œ ๋ฌธ์ œ ๋ฐœ์ƒ ์‹œ, ํ•ด๋‹น ๋ธŒ๋žœ์น˜์—์„œ๋ฒ„๊ทธ ์ˆ˜์ •
  • ๊ทœ์น™
    • main์œผ๋กœ๋ถ€ํ„ฐ checkout
    • ์ˆ˜์ • ์™„๋ฃŒ ํ›„ main, develop์— ๋ชจ๋‘ ๋ฐ˜์˜
    • ๋„ค์ด๋ฐ
      • hotfix/{x}.{y}.{z}-{description}
        • e.g., hotfix/2.0.4-remove_something_wrong_code

release & tag

  • production ๋ฐฐํฌ๋งˆ๋‹ค release ๋ฐ tag ์ถ”๊ฐ€
  • ๊ทœ์น™
    • ๋„ค์ด๋ฐ
      • v{x}.{y}.{z}
        • e.g., v2.0.4
โš ๏ธ **GitHub.com Fallback** โš ๏ธ