Branch Convention - 2021community/Algorithm-skills GitHub Wiki

๐ŸŽ™ ๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ๋ช…๋ช… ๊ทœ์น™

  • feature - ๊ธฐ๋Šฅ์ ์ธ ๋ถ€๋ถ„
  • hotfix - ๊ธ‰ํ•œ ๋ฒ„๊ทธ ์ˆ˜์ •
  • bugfix - ๋ฒ„๊ทธ ์ˆ˜์ •
main
develop
feature/#{issue_number}
bugfix/#{issue_number}
hotfix/#{issue_number}

์˜ˆ์™ธ) README๋ฅผ ์ž‘์—…ํ•  ๋•Œ์—๋Š” 
 - base ๋ธŒ๋žœ์น˜๋ฅผ 'feature/#47' ๋กœ ํ•œ๋‹ค.
 - ๊ทธ๋ฆฌ๊ณ  ์ด ๋ธŒ๋žœ์น˜์—์„œ 'featrue/#47-{์ด๋ฆ„}' ์œผ๋กœ ๋ถ„๊ธฐ๋ฅผ ๋‚˜๋ˆ  ์ž‘์—…์„ ์ง„ํ–‰ํ•˜๋„๋ก ํ•œ๋‹ค.

ex) hotfix/#1
ex) feature/#47-moonhyung

๐Ÿšจ ์ฃผ์˜ ์‚ฌํ•ญ

  • ์ƒˆ๋กœ์šด ๋ธŒ๋žœ์น˜๋ฅผ ๋ถ„๊ธฐ ํ•  ๋•Œ, ๊ผญ ๋ถ„๊ธฐ์ ์„ ํ™•์ธํ•œ๋‹ค.
    • feature ๋ธŒ๋žœ์น˜๋Š” develop
    • featrue/#47-{์ด๋ฆ„} ๋ธŒ๋žœ์น˜๋Š” featrue/#47
    • bugfix ๋ธŒ๋žœ์น˜๋Š” develop
    • hotfix ๋ธŒ๋žœ์น˜๋Š” main

๐ŸŒŠ git flow

feature/bugfix -> develop -> main
ใ€€ใ€€ใ€€ใ€€ใ€€ใ€€ใ€€ใ€€ใ€€ใ€€hotfix -> main

โš ๏ธ **GitHub.com Fallback** โš ๏ธ