earthkingman / 42Swim

42μ„œμšΈ QnA μ„œλΉ„μŠ€
14 stars 3 forks source link

🏊 42SWIM 🏊

PRs Welcome

42Seoul QnA Service
42SWIM 으둜 λΉ λ₯΄κ³  재밌고 νŽΈμ•ˆν•œ λ™λ£Œν‰κ°€ μ‹œμž‘ν•˜κΈ°!

:bulb: Introduction


πŸŽ‹ Github branch naming κ·œμΉ™

1) main branch, develop branch

main - μ œν’ˆμœΌλ‘œ μΆœμ‹œλ  수 μžˆλŠ” 브랜치 μ‚¬μš©μžμ—κ²Œ 배포 κ°€λŠ₯ν•œ μƒνƒœλ§Œμ„ κ΄€λ¦¬ν•œλ‹€. μ—¬κΈ°μ„œλŠ” 배포(release) 이λ ₯을 κ΄€λ¦¬ν•˜κΈ° μœ„ν•΄ μ‚¬μš©ν•œλ‹€. develop - λ‹€μŒ μΆœμ‹œ 버전을 κ°œλ°œν•˜λŠ” 브랜치 κΈ°λŠ₯ κ°œλ°œμ„ μœ„ν•΄ λΈŒλžœμΉ˜λ“€μ„ λ³‘ν•©ν•˜κΈ° μœ„ν•΄ μ‚¬μš©, 즉 λͺ¨λ“  κΈ°λŠ₯이 μΆ”κ°€λ˜κ³  버그가 μˆ˜μ •λ˜μ–΄ 배포 κ°€λŠ₯ν•œ μ•ˆμ •μ μΈ μƒνƒœλΌλ©΄ develop 을 main 으둜 λ³‘ν•©ν•œλ‹€. ν‰μ†Œμ—λŠ” 이 브랜치 기반으둜 κ°œλ°œμ„ μ§„ν–‰ν•œλ‹€.

2) feature branch

feature - μƒˆλ‘œμš΄ κΈ°λŠ₯ 개발 및 버그 μˆ˜μ •μ΄ ν•„μš”ν•  λ•Œλ§ˆλ‹€ develop λΈŒλžœμΉ˜λ‘œλΆ€ν„° λΆ„κΈ°ν•œλ‹€.

개발이 μ™„λ£Œλ˜λ©΄ develop 브랜치둜 merge ν•˜μ—¬ λ‹€λ₯Έ μ‚¬λžŒλ“€κ³Ό κ³΅μœ ν•œλ‹€. feature/front/κΈ°λŠ₯μš”μ•½ ex) feature/front/login, feature/back/login-api

feature/front/{issue-number}-κΈ°λŠ₯μš”μ•½ ex) feature/front/#77-login, feature/back/#77-login-api

3) release branch

release - 이번 μΆœμ‹œ 버전을 μ€€λΉ„ν•˜λŠ” 브랜치 ex) release-1.2

4) hotfix branch

hotfix - μΆœμ‹œ λ²„μ „μ—μ„œ λ°œμƒν•œ 버그λ₯Ό μˆ˜μ •ν•˜λŠ” 브랜치 ex) hotfix-1.2.1 μ°Έκ³ μ‚¬μ΄νŠΈ : https://velog.io/@kim-jaemin420/Git-branch-naming

feature/κΈ°λŠ₯μš”μ•½ μ—μ„œ κΈ°λŠ₯μš”μ•½ 뢀뢄을 μž‘μ„±ν• λ•Œ λ„μ–΄μ“°κΈ°λŠ” - λ₯Ό μ΄μš©ν•˜μ—¬ μž‘μ„± ex) loginApi (X) login-api (O)