Skip to content

Latest commit

ย 

History

History
63 lines (32 loc) ยท 1.2 KB

Git-Flow.md

File metadata and controls

63 lines (32 loc) ยท 1.2 KB

Branch Strategy

Git Flow

์ด 6๊ฐœ์˜ ๋ธŒ๋žœ์น˜๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

โœ… main

  • ์„œ๋น„์Šค๋ฅผ ๋ฐฐํฌํ•˜๋Š” ๋ธŒ๋žœ์น˜



โœ… develop

  • feature ์—์„œ ๊ฐœ๋ฐœ๋œ ๋‚ด์šฉ์ด ๋จธ์ง€๋˜๋Š” ๋ธŒ๋žœ์น˜



โœ… feature

  • ๊ฐ ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜

  • ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์€ feature/๊ธฐ๋Šฅ ์œผ๋กœ ๋งŒ๋“ ๋‹ค.

  • ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•œ๋‹ค๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ ๋‹ค.

    feature/login



โœ… release

  • ๋ฐฐํฌํ•˜๊ธฐ ์ „ QA ํ•˜๋Š” ๋ธŒ๋žœ์น˜

  • ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์€ release/๊ธฐ๋Šฅ ์œผ๋กœ ๋งŒ๋“ ๋‹ค.

  • ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์„ ํ…Œ์ŠคํŠธํ•œ๋‹ค๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ ๋‹ค.

    release/login



โœ… hotfix

  • main ๋ธŒ๋žœ์น˜์—์„œ ๋ฐฐํฌ๋ฅผ ํ•˜๊ณ  ๋‚˜์„œ ๋ฒ„๊ทธ๊ฐ€ ์ƒ๊ฒผ์„ ๋•Œ ์‹ ์†ํ•˜๊ฒŒ ๊ณ ์น˜๊ธฐ ์œ„ํ•œ ๋ธŒ๋žœ์น˜

  • ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์€ hotfix/๊ธฐ๋Šฅ ์œผ๋กœ ๋งŒ๋“ ๋‹ค.

  • ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์— ๋ฒ„๊ทธ๋งŒ ์žˆ๋‹ค๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ ๋‹ค.

    hotfix/login



โœ… refactor

  • ๋ฆฌํŒฉํ† ๋ง์„ ์œ„ํ•œ ๋ธŒ๋žœ์น˜

  • ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์€ refactor/๊ธฐ๋Šฅ ์œผ๋กœ ๋งŒ๋“ ๋‹ค.

  • ๋กœ๊ทธ์ธ ์ฝ”๋“œ๋ฅผ ๋ฆฌํŒฉํ† ๋งํ•œ๋‹ค๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ ๋‹ค.

    refactor/login