Skip to content
choiyoungjin edited this page Sep 26, 2021 · 9 revisions

Git Convention

Commit Message

[category] ๋ณ€๊ฒฝ์‚ฌํ•ญ ์š”์•ฝ [feat] ํ™ˆํ™”๋ฉด ํด๋” ๊ฐ€๋กœ์Šคํฌ๋กค ๊ตฌํ˜„

category description
feat ๊ธฐ๋Šฅ ์ถ”๊ฐ€
add ์ฝ”๋“œ ์ถ”๊ฐ€
delete ์ฝ”๋“œ ์‚ญ์ œ
mod ์ฝ”๋“œ ์ˆ˜์ •
fix ๋ฒ„๊ทธ ์ˆ˜์ •
chore

Branch Name

branchName-๋ณ€๊ฒฝ์‚ฌํ•ญ main-home-folder

Merge

  1. ๊ฐœ์ธ์ด ์ž‘์—…ํ•œ ๋ธŒ๋žœ์น˜๋ฅผ ์›๊ฒฉ ์ €์žฅ์†Œ์— pushํ•œ ํ›„ย Pull requestsย ๋ฅผ ์ž‘์„ฑํ•œ๋‹ค.
  2. ํ•„์š”์‹œ ๋‹ค๋ฅธ ํŒ€์›์—๊ฒŒย PR์š”์ฒญ, PR์„ ๋ฐ›์€ ํŒ€์›์€ ****์ฝ”๋“œ์— ๋Œ€ํ•œ ๋ฆฌ๋ทฐ๋ฅผ ์ž‘์„ฑํ•œ๋‹ค.
  3. ํŒ€์›์ด ์ˆ˜์ •์„ ์š”์ฒญํ•˜๋ฉด ๋กœ์ปฌ์—์„œ ์ˆ˜์ • ํ›„ ๋‹ค์‹œ push (์ˆ˜์ • ์™„๋ฃŒ ์Šฌ๋ž™์— ๊ณต์ง€)
  4. ๊ฐ์ž merge (๋‹จ, ๋‹ค๋ฅธ ํŒ€์›์ด ์ˆ˜์ •์„ ์š”์ฒญํ•œ ๊ฒฝ์šฐ, merge ๋™์˜๋ฅผ ๋ฐ›์•„์•ผ ํ•จ)

Development Process

  1. issue ์ƒ์„ฑ
  2. issue ๊ธฐ๋ฐ˜ branch ์ƒ์„ฑ
  3. issue์™€ ๊ด€๋ จ๋œ feature ๊ฐœ๋ฐœ ์™„๋ฃŒ
  4. PR์ด main branch๋กœ merge
  5. merge ํ›„ feature branch ์ œ๊ฑฐ
  6. issue close
Clone this wiki locally