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 λ™μž‘μ— 영ν–₯을 주지 μ•ŠλŠ” λ³€κ²½ 사항
refactor λ¦¬νŒ©ν† λ§

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