Before Develop - mash-up-kr/Nawa-Invitation-Web GitHub Wiki

Workflow

  • ์ž‘์—… ๋‹จ์œ„ ์ด์Šˆ์— ์˜ฌ๋ฆฌ๊ธฐ (issue template)
  • ์ž‘์—… ํ•  ์ด์Šˆ๋ฅผ ์นธ๋ฐ˜ ๋ณด๋“œ In progress ์— ์˜ฎ๊ธฐ๊ธฐ
  • ์ž‘์—… ํ•  ์ด์Šˆ์— ๋Œ€ํ•œ ๋ธŒ๋ Œ์น˜ ์ƒ์„ฑํ•˜๊ธฐ (์žˆ์œผ๋ฉด ์ƒ๋žต)
  • git fetch upstream develop ์œผ๋กœ ๊ธฐ์กด์ž‘์—…๋“ค fetch ํ•˜๊ณ  ์ž‘์—… ์‹œ์ž‘ํ•˜๊ธฐ
  • ์ด์Šˆ์— ๋Œ€ํ•œ ์ž‘์—…(๋งŒ!) ์ง„ํ–‰ํ•˜๊ณ  commit/push ํ•˜๊ธฐ (commit message template)
  • pull request ๋‚ ๋ฆฌ๊ธฐ (pull request ์ง€ํ‚ค๊ธฐ)
  • ๋ฆฌ๋ทฐ์–ด์˜ approve๊ฐ€ ๋‚˜๋ฉด develop branch์— mergeํ•˜๊ธฐ

Branch strategy

  • GitHub flow
  • default branch: develop
  • develop์—์„œ feature/๊ธฐ๋Šฅ์ด๋ฆ„์œผ๋กœ ๋ธŒ๋ Œ์น˜ ์ƒ์„ฑํ•˜๊ธฐ
  • local์˜ feature/๊ธฐ๋Šฅ์ด๋ฆ„์—์„œ origin์˜ feature/๊ธฐ๋Šฅ์ด๋ฆ„์œผ๋กœ push ๋‚ ๋ฆฌ๊ธฐ
  • origin์˜ feature/๊ธฐ๋Šฅ์ด๋ฆ„์—์„œ upstream์˜ develop์œผ๋กœ pull request ๋‚ ๋ฆฌ๊ธฐ

Coding convention