์ฝ˜ํ…์ธ  ๋Œ€ํ‘œ ์ด๋ฏธ์ง€ - ๐Ÿš€ Git ๋ธŒ๋žœ์น˜ ์ „๋žต, ์ด์ œ ์ œ๋Œ€๋กœ ์•Œ์•„๋ณด์ž!

๐Ÿš€ Git ๋ธŒ๋žœ์น˜ ์ „๋žต, ์ด์ œ ์ œ๋Œ€๋กœ ์•Œ์•„๋ณด์ž!

ํ˜‘์—…์˜ ๋‹ฌ์ธ์ด ๋˜๋Š” ๋ฒ„์ „ ๊ด€๋ฆฌ ์™„๋ฒฝ ๊ฐ€์ด๋“œ

main develop release feature hotfix Git Branch Strategy

์•ˆ๋…•! ๐Ÿ‘‹ ์˜ค๋Š˜์€ ๊ฐœ๋ฐœ์ž๋ผ๋ฉด ๋ฐ˜๋“œ์‹œ ์•Œ์•„์•ผ ํ•  Git ๋ธŒ๋žœ์น˜ ์ „๋žต์— ๋Œ€ํ•ด ์ด์•ผ๊ธฐํ•ด๋ณผ๊ฒŒ. ํ˜ผ์ž ์ฝ”๋”ฉํ•  ๋•Œ๋Š” ๋ชฐ๋ž๋Š”๋ฐ, ํŒ€ ํ”„๋กœ์ ํŠธ ์‹œ์ž‘ํ•˜๋ฉด์„œ "์–ด? ๋‚ด ์ฝ”๋“œ๊ฐ€ ์™œ ์‚ฌ๋ผ์กŒ์ง€?" ๊ฐ™์€ ๊ฒฝํ—˜ ์žˆ์ง€ ์•Š์•„? ๐Ÿ˜… ๊ทธ๊ฒŒ ๋ฐ”๋กœ ๋ธŒ๋žœ์น˜ ์ „๋žต์ด ์—†์–ด์„œ ์ƒ๊ธฐ๋Š” ๋ฌธ์ œ์•ผ!

์š”์ฆ˜ ๊ฐœ๋ฐœ ํ˜„์žฅ์—์„œ๋Š” Git์„ ๋ชจ๋ฅด๋ฉด ์ผ์„ ์‹œ์ž‘์กฐ์ฐจ ๋ชปํ•ด. ๊ทธ๋Ÿฐ๋ฐ Git์„ ์•ˆ๋‹ค๋Š” ๊ฒŒ ๋‹จ์ˆœํžˆ git add, git commit, git push๋งŒ ํ•  ์ค„ ์•ˆ๋‹ค๋Š” ๊ฒŒ ์•„๋‹ˆ์•ผ. ์ง„์งœ ์‹ค๋ ฅ์€ ๋ธŒ๋žœ์น˜๋ฅผ ์–ด๋–ป๊ฒŒ ๊ด€๋ฆฌํ•˜๋А๋ƒ์—์„œ ๋‚˜ํƒ€๋‚˜๊ฑฐ๋“ ! ๐ŸŽฏ


๐Ÿค” ๋ธŒ๋žœ์น˜ ์ „๋žต์ด ๋ญ๊ธธ๋ž˜ ์ด๋ ‡๊ฒŒ ์ค‘์š”ํ•ด?

์ƒ์ƒํ•ด๋ด. ๋„ˆ์™€ ์นœ๊ตฌ 3๋ช…์ด ํ•จ๊ป˜ ์›น์‚ฌ์ดํŠธ๋ฅผ ๋งŒ๋“ค๊ณ  ์žˆ์–ด. ๋„ˆ๋Š” ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ์„, ์นœ๊ตฌ A๋Š” ๊ฒŒ์‹œํŒ์„, ์นœ๊ตฌ B๋Š” ๊ฒฐ์ œ ์‹œ์Šคํ…œ์„, ์นœ๊ตฌ C๋Š” ๋””์ž์ธ์„ ๋‹ด๋‹นํ•˜๊ณ  ์žˆ์ง€. ๊ทธ๋Ÿฐ๋ฐ ๋ชจ๋‘๊ฐ€ ๊ฐ™์€ ํŒŒ์ผ์„ ๋™์‹œ์— ์ˆ˜์ •ํ•˜๋ฉด ์–ด๋–ป๊ฒŒ ๋ ๊นŒ? ๐Ÿคฏ

๋ธŒ๋žœ์น˜ ์ „๋žต ์—†์ด ์ž‘์—…ํ•˜๋ฉด:

โ€ข ์นœ๊ตฌ A๊ฐ€ ์˜ฌ๋ฆฐ ์ฝ”๋“œ๊ฐ€ ๋„ˆ์˜ ์ฝ”๋“œ๋ฅผ ๋ฎ์–ด์จ๋ฒ„๋ฆผ ๐Ÿ˜ฑ
โ€ข ๋ฒ„๊ทธ๊ฐ€ ์ƒ๊ฒผ๋Š”๋ฐ ๋ˆ„๊ฐ€ ๋งŒ๋“  ๋ฒ„๊ทธ์ธ์ง€ ์ฐพ์„ ์ˆ˜ ์—†์Œ ๐Ÿ”
โ€ข ๊ธ‰ํ•˜๊ฒŒ ์ˆ˜์ •ํ•ด์•ผ ํ•˜๋Š”๋ฐ ๋‹ค๋ฅธ ์‚ฌ๋žŒ ์ž‘์—… ๋•Œ๋ฌธ์— ๋ชปํ•จ โฐ
โ€ข ๋ฐฐํฌํ•˜๋ ค๋Š”๋ฐ ์™„์„ฑ๋˜์ง€ ์•Š์€ ๊ธฐ๋Šฅ์ด ์„ž์—ฌ์žˆ์Œ ๐Ÿšซ
โ€ข ๊ฒฐ๊ตญ ํ”„๋กœ์ ํŠธ๋Š” ์นด์˜ค์Šค... ๐Ÿ’ฅ

์ด๋Ÿฐ ๋ฌธ์ œ๋ฅผ ํ•ด๊ฒฐํ•˜๊ธฐ ์œ„ํ•ด ๋“ฑ์žฅํ•œ ๊ฒŒ ๋ฐ”๋กœ ๋ธŒ๋žœ์น˜ ์ „๋žต์ด์•ผ! ์‰ฝ๊ฒŒ ๋งํ•˜๋ฉด, ๊ฐ์ž ์ž๊ธฐ๋งŒ์˜ ์ž‘์—… ๊ณต๊ฐ„(๋ธŒ๋žœ์น˜)์—์„œ ์ผํ•˜๋‹ค๊ฐ€, ์™„์„ฑ๋˜๋ฉด ํ•ฉ์น˜๋Š”(merge) ๋ฐฉ์‹์ด์ง€. ๋งˆ์น˜ ์—ฌ๋Ÿฌ ๋ช…์ด ๊ฐ™์€ ๋ฌธ์„œ๋ฅผ ํŽธ์ง‘ํ•  ๋•Œ ๊ตฌ๊ธ€ ๋…์Šค๋ฅผ ์“ฐ๋Š” ๊ฒƒ์ฒ˜๋Ÿผ ๋ง์ด์•ผ! ๐Ÿ“

๐Ÿ’ก Tip: ๋ธŒ๋žœ์น˜๋Š” '๋‚˜๋ญ‡๊ฐ€์ง€'๋ผ๋Š” ๋œป์ด์•ผ. ๋ฉ”์ธ ์ค„๊ธฐ(main branch)์—์„œ ๊ฐ€์ง€๋ฅผ ๋ป—์–ด๋‚˜๊ฐ€ ์ž‘์—…ํ•˜๊ณ , ์™„์„ฑ๋˜๋ฉด ๋‹ค์‹œ ์ค„๊ธฐ๋กœ ํ•ฉ์น˜๋Š” ๊ฐœ๋…์ด์ง€!

๐ŸŒณ Git ๋ธŒ๋žœ์น˜์˜ ๊ธฐ๋ณธ ๊ฐœ๋… ๋‹ค์ง€๊ธฐ

๋ธŒ๋žœ์น˜๊ฐ€ ์ •ํ™•ํžˆ ๋ญ์•ผ?

Git์—์„œ ๋ธŒ๋žœ์น˜๋Š” ๋…๋ฆฝ์ ์ธ ์ž‘์—… ๊ณต๊ฐ„์ด์•ผ. ์›๋ณธ ์ฝ”๋“œ๋ฅผ ๊ฑด๋“œ๋ฆฌ์ง€ ์•Š๊ณ  ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๊ฑฐ๋‚˜ ์‹คํ—˜ํ•  ์ˆ˜ ์žˆ๋Š” ์•ˆ์ „ํ•œ ๋†€์ดํ„ฐ ๊ฐ™์€ ๊ฑฐ์ง€! ๐ŸŽช

์˜ˆ๋ฅผ ๋“ค์–ด๋ณผ๊ฒŒ. ๋„ˆ์˜ ํ”„๋กœ์ ํŠธ์— main ๋ธŒ๋žœ์น˜๊ฐ€ ์žˆ์–ด. ์ด๊ฑด ํ•ญ์ƒ ์•ˆ์ •์ ์œผ๋กœ ์ž‘๋™ํ•˜๋Š” ์ฝ”๋“œ๊ฐ€ ์žˆ๋Š” ๊ณณ์ด์•ผ. ๊ทธ๋Ÿฐ๋ฐ ์ƒˆ๋กœ์šด '๋‹คํฌ๋ชจ๋“œ' ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•˜๊ณ  ์‹ถ์–ด. ์ด๋•Œ main์—์„œ ์ง์ ‘ ์ž‘์—…ํ•˜๋ฉด ์œ„ํ—˜ํ•˜์ž–์•„? ๊ทธ๋ž˜์„œ feature/dark-mode๋ผ๋Š” ์ƒˆ ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ค์–ด์„œ ๊ฑฐ๊ธฐ์„œ ์ž‘์—…ํ•˜๋Š” ๊ฑฐ์•ผ! โœจ

# ์ƒˆ ๋ธŒ๋žœ์น˜ ๋งŒ๋“ค๊ธฐ
git branch feature/dark-mode

# ๋ธŒ๋žœ์น˜๋กœ ์ด๋™ํ•˜๊ธฐ
git checkout feature/dark-mode

# ๋˜๋Š” ํ•œ ๋ฒˆ์—!
git checkout -b feature/dark-mode

๋ธŒ๋žœ์น˜์˜ ์ข…๋ฅ˜๋ฅผ ์•Œ์•„๋ณด์ž

์ผ๋ฐ˜์ ์œผ๋กœ ํ”„๋กœ์ ํŠธ์—์„œ ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜๋Š” ํฌ๊ฒŒ 5๊ฐ€์ง€ ํƒ€์ž…์œผ๋กœ ๋‚˜๋ˆŒ ์ˆ˜ ์žˆ์–ด:

Main/Master ๋ฉ”์ธ ๋ธŒ๋žœ์น˜

๋ฐฐํฌ ๊ฐ€๋Šฅํ•œ ์ƒํƒœ์˜ ์ฝ”๋“œ๋งŒ ์žˆ๋Š” ๊ณณ. ์ ˆ๋Œ€ ์ง์ ‘ ์ˆ˜์ •ํ•˜์ง€ ์•Š๊ณ , ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜์—์„œ merge๋งŒ ๋ฐ›์•„! ๐Ÿ†

Develop ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜

๋‹ค์Œ ๋ฐฐํฌ๋ฅผ ์œ„ํ•ด ๊ฐœ๋ฐœํ•˜๋Š” ์ฝ”๋“œ๊ฐ€ ๋ชจ์ด๋Š” ๊ณณ. ๊ฐœ๋ฐœ์ž๋“ค์˜ ์ž‘์—…์ด ํ†ตํ•ฉ๋˜๋Š” ์ค‘์‹ฌ์ง€์•ผ! ๐ŸŽฏ

Feature ๊ธฐ๋Šฅ ๋ธŒ๋žœ์น˜

์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•  ๋•Œ ์‚ฌ์šฉ. develop์—์„œ ๋ถ„๊ธฐํ•ด์„œ ์ž‘์—…ํ•˜๊ณ , ์™„์„ฑ๋˜๋ฉด ๋‹ค์‹œ develop์œผ๋กœ! ๐Ÿ’ก

Release ๋ฆด๋ฆฌ์ฆˆ ๋ธŒ๋žœ์น˜

๋ฐฐํฌ ์ค€๋น„๋ฅผ ์œ„ํ•œ ๋ธŒ๋žœ์น˜. ๋ฒ„๊ทธ ์ˆ˜์ •๊ณผ ๋ฉ”ํƒ€๋ฐ์ดํ„ฐ ์ค€๋น„๋งŒ ํ•ด! ๐Ÿš€

Hotfix ํ•ซํ”ฝ์Šค ๋ธŒ๋žœ์น˜

๋ฐฐํฌ๋œ ๋ฒ„์ „์— ๊ธด๊ธ‰ ๋ฒ„๊ทธ๊ฐ€ ์ƒ๊ฒผ์„ ๋•Œ ์‚ฌ์šฉ. ๋น ๋ฅด๊ฒŒ ์ˆ˜์ •ํ•˜๊ณ  ๋ฐ”๋กœ ๋ฐฐํฌ! ๐Ÿšจ

๐ŸŽฏ ๋Œ€ํ‘œ์ ์ธ ๋ธŒ๋žœ์น˜ ์ „๋žต๋“ค

์ž, ์ด์ œ ์‹ค์ „์œผ๋กœ ๋“ค์–ด๊ฐ€๋ณผ๊นŒ? ์„ธ์ƒ์—๋Š” ์—ฌ๋Ÿฌ ๋ธŒ๋žœ์น˜ ์ „๋žต์ด ์žˆ๋Š”๋ฐ, ๊ฐ๊ฐ ์žฅ๋‹จ์ ์ด ์žˆ์–ด. ๋„ˆ์˜ ํŒ€ ๊ทœ๋ชจ์™€ ํ”„๋กœ์ ํŠธ ํŠน์„ฑ์— ๋งž๋Š” ๊ฑธ ์„ ํƒํ•˜๋ฉด ๋ผ! ๐Ÿ˜Š

1. Git Flow - ๊ฐ€์žฅ ์œ ๋ช…ํ•œ ์ „๋žต ๐ŸŒŸ

Git Flow๋Š” Vincent Driessen์ด๋ผ๋Š” ๊ฐœ๋ฐœ์ž๊ฐ€ 2010๋…„์— ์ œ์•ˆํ•œ ๋ชจ๋ธ์ด์•ผ. ๊ฐ€์žฅ ๋„๋ฆฌ ์•Œ๋ ค์ง„ ๋ธŒ๋žœ์น˜ ์ „๋žต์ด๊ณ , ์ฒด๊ณ„์ ์ด๊ณ  ๋ช…ํ™•ํ•ด์„œ ๋งŽ์€ ๊ธฐ์—…์—์„œ ์‚ฌ์šฉํ•˜๊ณ  ์žˆ์–ด!

main develop feature release hotfix

๐Ÿ”„ Git Flow์˜ ์ž‘๋™ ๋ฐฉ์‹:

Step 1: main๊ณผ develop ๋ธŒ๋žœ์น˜๋ฅผ ๊ธฐ๋ณธ์œผ๋กœ ์œ ์ง€ํ•ด

โ€ข main: ๋ฐฐํฌ๋œ ์•ˆ์ • ๋ฒ„์ „
โ€ข develop: ๋‹ค์Œ ๋ฐฐํฌ๋ฅผ ์œ„ํ•œ ๊ฐœ๋ฐœ ์ค‘์ธ ์ฝ”๋“œ

Step 2: ์ƒˆ ๊ธฐ๋Šฅ ๊ฐœ๋ฐœํ•  ๋•Œ๋Š” feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ

git checkout -b feature/user-authentication develop

Step 3: ๊ธฐ๋Šฅ ์™„์„ฑ๋˜๋ฉด develop์œผ๋กœ merge

git checkout develop
git merge --no-ff feature/user-authentication
git branch -d feature/user-authentication

Step 4: ๋ฐฐํฌ ์ค€๋น„๋˜๋ฉด release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ

git checkout -b release/1.0.0 develop

Step 5: ํ…Œ์ŠคํŠธ ํ›„ main๊ณผ develop ์–‘์ชฝ์— merge

git checkout main
git merge --no-ff release/1.0.0
git tag -a v1.0.0

git checkout develop
git merge --no-ff release/1.0.0

Step 6: ๊ธด๊ธ‰ ๋ฒ„๊ทธ ๋ฐœ์ƒ ์‹œ hotfix ๋ธŒ๋žœ์น˜๋กœ ์ฆ‰์‹œ ๋Œ€์‘

git checkout -b hotfix/1.0.1 main
# ๋ฒ„๊ทธ ์ˆ˜์ • ํ›„
git checkout main
git merge --no-ff hotfix/1.0.1
git tag -a v1.0.1

git checkout develop
git merge --no-ff hotfix/1.0.1
๐Ÿ’ก Git Flow๊ฐ€ ์ ํ•ฉํ•œ ๊ฒฝ์šฐ: โ€ข ๋ช…ํ™•ํ•œ ๋ฐฐํฌ ์ฃผ๊ธฐ๊ฐ€ ์žˆ๋Š” ํ”„๋กœ์ ํŠธ
โ€ข ์—ฌ๋Ÿฌ ๋ฒ„์ „์„ ๋™์‹œ์— ์ง€์›ํ•ด์•ผ ํ•˜๋Š” ๊ฒฝ์šฐ
โ€ข ํŒ€ ๊ทœ๋ชจ๊ฐ€ ํฌ๊ณ  ์ฒด๊ณ„์ ์ธ ๊ด€๋ฆฌ๊ฐ€ ํ•„์š”ํ•  ๋•Œ
โ€ข ์ „ํ†ต์ ์ธ ์†Œํ”„ํŠธ์›จ์–ด ๊ฐœ๋ฐœ (ํŒจํ‚ค์ง€, ์•ฑ ๋“ฑ)
โš ๏ธ Git Flow์˜ ๋‹จ์ : โ€ข ๋ธŒ๋žœ์น˜๊ฐ€ ๋งŽ์•„์„œ ๋ณต์žกํ•  ์ˆ˜ ์žˆ์–ด
โ€ข ๋น ๋ฅธ ๋ฐฐํฌ๊ฐ€ ํ•„์š”ํ•œ ์›น ์„œ๋น„์Šค์—๋Š” ๊ณผํ•  ์ˆ˜ ์žˆ์Œ
โ€ข ์ดˆ๋ณด์ž๊ฐ€ ์ฒ˜์Œ ๋ฐฐ์šฐ๊ธฐ์—” ์–ด๋ ค์šธ ์ˆ˜ ์žˆ์–ด

2. GitHub Flow - ์‹ฌํ”Œํ•˜๊ณ  ๊ฐ•๋ ฅํ•ด! ๐Ÿ’ช

GitHub Flow๋Š” Git Flow๋ณด๋‹ค ํ›จ์”ฌ ๊ฐ„๋‹จํ•ด! GitHub์—์„œ ์‚ฌ์šฉํ•˜๋Š” ๋ฐฉ์‹์ด๊ณ , ์ง€์†์  ๋ฐฐํฌ(Continuous Deployment)์— ์ตœ์ ํ™”๋˜์–ด ์žˆ์–ด. ์š”์ฆ˜ ์Šคํƒ€ํŠธ์—…์ด๋‚˜ ์›น ์„œ๋น„์Šค ๊ฐœ๋ฐœํŒ€์—์„œ ๋งŽ์ด ์“ฐ์ง€! ๐Ÿš€

๐ŸŽฏ GitHub Flow์˜ ํ•ต์‹ฌ ์›์น™:

1. main ๋ธŒ๋žœ์น˜๋Š” ํ•ญ์ƒ ๋ฐฐํฌ ๊ฐ€๋Šฅํ•œ ์ƒํƒœ

main์— ์žˆ๋Š” ์ฝ”๋“œ๋Š” ์–ธ์ œ๋“  ํ”„๋กœ๋•์…˜์— ๋ฐฐํฌํ•  ์ˆ˜ ์žˆ์–ด์•ผ ํ•ด. ํ…Œ์ŠคํŠธ๋ฅผ ํ†ต๊ณผํ•œ ์•ˆ์ •์ ์ธ ์ฝ”๋“œ๋งŒ!

2. ์ƒˆ ์ž‘์—…์€ main์—์„œ ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ค์–ด

git checkout -b feature/add-payment-method main

3. ๋ธŒ๋žœ์น˜ ์ด๋ฆ„์€ ๋ช…ํ™•ํ•˜๊ฒŒ

feature/add-payment-method, fix/login-bug, hotfix/security-patch ์ด๋Ÿฐ ์‹์œผ๋กœ ๋ญ˜ ํ•˜๋Š” ๋ธŒ๋žœ์น˜์ธ์ง€ ๋ฐ”๋กœ ์•Œ ์ˆ˜ ์žˆ๊ฒŒ!

4. ์ •๊ธฐ์ ์œผ๋กœ ์ปค๋ฐ‹ํ•˜๊ณ  ์›๊ฒฉ์— ํ‘ธ์‹œ

git add .
git commit -m "Add credit card validation"
git push origin feature/add-payment-method

5. Pull Request(PR)๋กœ ํ”ผ๋“œ๋ฐฑ ๋ฐ›๊ธฐ

์ž‘์—…์ด ์™„๋ฃŒ๋˜๋ฉด PR์„ ์—ด์–ด์„œ ํŒ€์›๋“ค์—๊ฒŒ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๋ฅผ ์š”์ฒญํ•ด. ์ด๊ฒŒ GitHub Flow์˜ ํ•ต์‹ฌ์ด์•ผ! ๐Ÿ‘ฅ

6. ๋ฆฌ๋ทฐ ์Šน์ธ ํ›„ main์— merge

์ตœ์†Œ 1๋ช… ์ด์ƒ์˜ ์Šน์ธ์„ ๋ฐ›์œผ๋ฉด main์— mergeํ•˜๊ณ  ์ž๋™์œผ๋กœ ๋ฐฐํฌ!

7. merge ์ฆ‰์‹œ ๋ฐฐํฌ

main์— merge๋˜๋ฉด CI/CD ํŒŒ์ดํ”„๋ผ์ธ์„ ํ†ตํ•ด ์ž๋™์œผ๋กœ ํ”„๋กœ๋•์…˜์— ๋ฐฐํฌ๋ผ!

๐Ÿ’ก GitHub Flow๊ฐ€ ์ ํ•ฉํ•œ ๊ฒฝ์šฐ: โ€ข ์ง€์†์  ๋ฐฐํฌ๋ฅผ ํ•˜๋Š” ์›น ์„œ๋น„์Šค
โ€ข ๋น ๋ฅธ ๊ฐœ๋ฐœ๊ณผ ๋ฐฐํฌ๊ฐ€ ์ค‘์š”ํ•œ ์Šคํƒ€ํŠธ์—…
โ€ข ํŒ€ ๊ทœ๋ชจ๊ฐ€ ์ž‘๊ฑฐ๋‚˜ ์ค‘๊ฐ„ ์ •๋„
โ€ข ๋‹จ์ผ ๋ฒ„์ „๋งŒ ์œ ์ง€ํ•˜๋Š” ์„œ๋น„์Šค

3. GitLab Flow - ๋‘ ์„ธ๊ณ„์˜ ์žฅ์ ์„ ํ•ฉ์ณค์–ด! ๐ŸŒˆ

GitLab Flow๋Š” Git Flow์™€ GitHub Flow์˜ ์ค‘๊ฐ„ ์ง€์ ์ด์•ผ. ํ™˜๊ฒฝ๋ณ„ ๋ธŒ๋žœ์น˜๋ฅผ ๋‘์–ด์„œ ๋” ์•ˆ์ „ํ•˜๊ฒŒ ๋ฐฐํฌํ•  ์ˆ˜ ์žˆ์–ด!

๐Ÿ”€ GitLab Flow์˜ ๊ตฌ์กฐ:

ํ™˜๊ฒฝ๋ณ„ ๋ธŒ๋žœ์น˜ ์ „๋žต:

โ€ข main: ๊ฐœ๋ฐœ ํ™˜๊ฒฝ
โ€ข pre-production: ์Šคํ…Œ์ด์ง• ํ™˜๊ฒฝ
โ€ข production: ํ”„๋กœ๋•์…˜ ํ™˜๊ฒฝ

์ž‘์—… ํ๋ฆ„:

1. main์—์„œ feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
2. ์ž‘์—… ์™„๋ฃŒ ํ›„ main์œผ๋กœ merge
3. main์—์„œ pre-production์œผ๋กœ merge (์Šคํ…Œ์ด์ง• ๋ฐฐํฌ)
4. ํ…Œ์ŠคํŠธ ํ†ต๊ณผ ํ›„ production์œผ๋กœ merge (ํ”„๋กœ๋•์…˜ ๋ฐฐํฌ)

# Feature ๊ฐœ๋ฐœ
git checkout -b feature/new-dashboard main
# ... ์ž‘์—… ...
git push origin feature/new-dashboard
# PR ์ƒ์„ฑ ๋ฐ main์œผ๋กœ merge

# ์Šคํ…Œ์ด์ง• ๋ฐฐํฌ
git checkout pre-production
git merge main
git push origin pre-production

# ํ”„๋กœ๋•์…˜ ๋ฐฐํฌ
git checkout production
git merge pre-production
git push origin production
๐Ÿ’ก GitLab Flow๊ฐ€ ์ ํ•ฉํ•œ ๊ฒฝ์šฐ: โ€ข ์—ฌ๋Ÿฌ ๋ฐฐํฌ ํ™˜๊ฒฝ์ด ์žˆ๋Š” ํ”„๋กœ์ ํŠธ
โ€ข ๋ฐฐํฌ ์ „ ์ถฉ๋ถ„ํ•œ ํ…Œ์ŠคํŠธ๊ฐ€ ํ•„์š”ํ•œ ๊ฒฝ์šฐ
โ€ข ๋กค๋ฐฑ์ด ์‰ฌ์›Œ์•ผ ํ•˜๋Š” ์„œ๋น„์Šค
โ€ข ์ค‘๊ฐ„ ๊ทœ๋ชจ ์ด์ƒ์˜ ํŒ€

4. Trunk Based Development - ์ตœ์†Œ์ฃผ์˜ ์ ‘๊ทผ! ๐ŸŽฏ

Trunk Based Development๋Š” ๊ฐ€์žฅ ์‹ฌํ”Œํ•œ ์ „๋žต์ด์•ผ. ๊ฑฐ์˜ ๋ชจ๋“  ์ž‘์—…์„ main(trunk)์—์„œ ์ง์ ‘ ํ•˜๊ฑฐ๋‚˜, ์•„์ฃผ ์งง์€ ์ˆ˜๋ช…์˜ ๋ธŒ๋žœ์น˜๋งŒ ์‚ฌ์šฉํ•ด!

โšก ํ•ต์‹ฌ ์›์น™:

โ€ข ๋ธŒ๋žœ์น˜๋Š” ์ตœ๋Œ€ 1-2์ผ ์•ˆ์— merge
โ€ข ์ž‘์€ ๋‹จ์œ„๋กœ ์ž์ฃผ ์ปค๋ฐ‹
โ€ข Feature Flag๋กœ ๋ฏธ์™„์„ฑ ๊ธฐ๋Šฅ ์ˆจ๊ธฐ๊ธฐ
โ€ข ๊ฐ•๋ ฅํ•œ ์ž๋™ํ™” ํ…Œ์ŠคํŠธ ํ•„์ˆ˜
โ€ข ์ง€์†์  ํ†ตํ•ฉ(CI) ํ•„์ˆ˜

# ์•„์ฃผ ์งง์€ ๋ธŒ๋žœ์น˜
git checkout -b quick-fix main
# ๋น ๋ฅด๊ฒŒ ์ž‘์—…
git commit -m "Fix typo in header"
git push origin quick-fix
# ์ฆ‰์‹œ PR ์ƒ์„ฑ ๋ฐ merge

# ๋˜๋Š” ์ง์ ‘ main์— ์ปค๋ฐ‹ (์ž‘์€ ๋ณ€๊ฒฝ์‚ฌํ•ญ)
git checkout main
git pull
# ์ž‘์—…
git commit -m "Update button color"
git push origin main
๐Ÿ’ก Trunk Based Development๊ฐ€ ์ ํ•ฉํ•œ ๊ฒฝ์šฐ: โ€ข ๋งค์šฐ ์ˆ™๋ จ๋œ ๊ฐœ๋ฐœํŒ€
โ€ข ๊ฐ•๋ ฅํ•œ ์ž๋™ํ™” ํ…Œ์ŠคํŠธ ์ธํ”„๋ผ
โ€ข ๋น ๋ฅธ ํ”ผ๋“œ๋ฐฑ์ด ์ค‘์š”ํ•œ ํ™˜๊ฒฝ
โ€ข Google, Facebook ๊ฐ™์€ ๋Œ€๊ทœ๋ชจ ํ…Œํฌ ๊ธฐ์—…
โš ๏ธ ์ฃผ์˜์‚ฌํ•ญ: ์ดˆ๋ณด ํŒ€์—๊ฒŒ๋Š” ๊ถŒ์žฅํ•˜์ง€ ์•Š์•„! ํ…Œ์ŠคํŠธ ์ž๋™ํ™”์™€ CI/CD๊ฐ€ ์™„๋ฒฝํ•˜๊ฒŒ ๊ฐ–์ถฐ์ ธ ์žˆ์–ด์•ผ ํ•˜๊ณ , ํŒ€์› ๋ชจ๋‘๊ฐ€ ๋†’์€ ์ˆ˜์ค€์˜ ์ฝ”๋“œ ํ’ˆ์งˆ์„ ์œ ์ง€ํ•  ์ˆ˜ ์žˆ์–ด์•ผ ํ•ด.

๐Ÿ› ๏ธ ๋ธŒ๋žœ์น˜ ์ „๋žต ์‹ค์ „ ์ ์šฉํ•˜๊ธฐ

์ด๋ก ์€ ์ถฉ๋ถ„ํžˆ ๋ฐฐ์› ์œผ๋‹ˆ, ์ด์ œ ์‹ค์ œ๋กœ ์–ด๋–ป๊ฒŒ ์ ์šฉํ•˜๋Š”์ง€ ์•Œ์•„๋ณผ๊นŒ? ์‹ค๋ฌด์—์„œ ๋ฐ”๋กœ ์“ธ ์ˆ˜ ์žˆ๋Š” ํŒ๋“ค์„ ์•Œ๋ ค์ค„๊ฒŒ! ๐Ÿ’ผ

๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ ์ปจ๋ฒค์…˜ ๐Ÿ“

๋ธŒ๋žœ์น˜ ์ด๋ฆ„์„ ์ž˜ ์ง“๋Š” ๊ฒƒ๋„ ์ค‘์š”ํ•œ ์Šคํ‚ฌ์ด์•ผ! 6๊ฐœ์›” ํ›„์— ๋ด๋„ ๋ญํ•˜๋Š” ๋ธŒ๋žœ์น˜์ธ์ง€ ๋ฐ”๋กœ ์•Œ ์ˆ˜ ์žˆ์–ด์•ผ ํ•˜๊ฑฐ๋“ .

์ถ”์ฒœํ•˜๋Š” ๋„ค์ด๋ฐ ๊ทœ์น™:

Feature ๋ธŒ๋žœ์น˜:

feature/๊ธฐ๋Šฅ๋ช…
feature/user-authentication
feature/payment-integration
feature/dark-mode
feature/JIRA-1234-add-search

Bug Fix ๋ธŒ๋žœ์น˜:

fix/๋ฒ„๊ทธ๋ช…
fix/login-error
fix/memory-leak
fix/JIRA-5678-cart-calculation

Hotfix ๋ธŒ๋žœ์น˜:

hotfix/๊ธด๊ธ‰์ˆ˜์ •๋ช…
hotfix/security-vulnerability
hotfix/payment-failure
hotfix/1.2.1

Release ๋ธŒ๋žœ์น˜:

release/๋ฒ„์ „
release/1.0.0
release/2.1.0
release/2024-Q1

Refactor ๋ธŒ๋žœ์น˜:

refactor/๋ฆฌํŒฉํ† ๋ง๋‚ด์šฉ
refactor/database-optimization
refactor/api-restructure
๐Ÿ’ก ๋„ค์ด๋ฐ ํŒ: โ€ข ์†Œ๋ฌธ์ž์™€ ํ•˜์ดํ”ˆ(-) ์‚ฌ์šฉ
โ€ข ๋„ˆ๋ฌด ๊ธธ์ง€ ์•Š๊ฒŒ (50์ž ์ด๋‚ด)
โ€ข ์ด์Šˆ ํŠธ๋ž˜์ปค ๋ฒˆํ˜ธ ํฌํ•จํ•˜๋ฉด ์ถ”์  ์‰ฌ์›Œ์ง
โ€ข ํŒ€ ๋‚ด์—์„œ ๊ทœ์น™ ํ†ต์ผํ•˜๊ธฐ!

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ์ž‘์„ฑ๋ฒ• โœ๏ธ

์ข‹์€ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋Š” ํ”„๋กœ์ ํŠธ์˜ ์—ญ์‚ฌ์ฑ…์ด์•ผ! ๋‚˜์ค‘์— "์ด ์ฝ”๋“œ ์™œ ์ด๋ ‡๊ฒŒ ์งฐ์ง€?"ํ•  ๋•Œ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๊ฐ€ ๋‹ต์„ ์ค˜.

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ตฌ์กฐ:

ํƒ€์ž…: ์ œ๋ชฉ (50์ž ์ด๋‚ด)

๋ณธ๋ฌธ (์„ ํƒ์‚ฌํ•ญ, 72์ž๋งˆ๋‹ค ์ค„๋ฐ”๊ฟˆ)
- ๋ฌด์—‡์„ ๋ณ€๊ฒฝํ–ˆ๋Š”์ง€
- ์™œ ๋ณ€๊ฒฝํ–ˆ๋Š”์ง€
- ์–ด๋–ค ์˜ํ–ฅ์ด ์žˆ๋Š”์ง€

Footer (์„ ํƒ์‚ฌํ•ญ)
- ์ด์Šˆ ๋ฒˆํ˜ธ
- Breaking Changes

ํƒ€์ž… ์ข…๋ฅ˜:

feat ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€
fix ๋ฒ„๊ทธ ์ˆ˜์ •
docs ๋ฌธ์„œ ์ˆ˜์ •
style ์ฝ”๋“œ ํฌ๋งทํŒ… (๊ธฐ๋Šฅ ๋ณ€๊ฒฝ ์—†์Œ)
refactor ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง
test ํ…Œ์ŠคํŠธ ์ฝ”๋“œ
chore ๋นŒ๋“œ, ์„ค์ • ํŒŒ์ผ ์ˆ˜์ •

์ข‹์€ ์˜ˆ์‹œ:

feat: ์‚ฌ์šฉ์ž ํ”„๋กœํ•„ ์ด๋ฏธ์ง€ ์—…๋กœ๋“œ ๊ธฐ๋Šฅ ์ถ”๊ฐ€

- AWS S3 ์—ฐ๋™ํ•˜์—ฌ ์ด๋ฏธ์ง€ ์ €์žฅ
- ์ด๋ฏธ์ง€ ํฌ๊ธฐ ์ž๋™ ์กฐ์ ˆ (์ตœ๋Œ€ 2MB)
- ํ”„๋กœํ•„ ํŽ˜์ด์ง€์— ์—…๋กœ๋“œ UI ์ถ”๊ฐ€

Resolves: #123

๋‚˜์œ ์˜ˆ์‹œ:

์ˆ˜์ •
๋ฒ„๊ทธ ๊ณ ์นจ
ใ…‡ใ…‡
asdf
...

Pull Request ์ž‘์„ฑ ๊ฐ€์ด๋“œ ๐Ÿ“‹

PR์€ ๋‹จ์ˆœํžˆ ์ฝ”๋“œ๋ฅผ ํ•ฉ์น˜๋Š” ๊ฒŒ ์•„๋‹ˆ์•ผ. ํŒ€์›๋“ค๊ณผ ์†Œํ†ตํ•˜๊ณ , ์ฝ”๋“œ ํ’ˆ์งˆ์„ ๋†’์ด๋Š” ์ค‘์š”ํ•œ ๊ณผ์ •์ด์ง€!

์ข‹์€ PR์˜ ์กฐ๊ฑด:

1. ๋ช…ํ™•ํ•œ ์ œ๋ชฉ

โŒ ๋‚˜์œ ์˜ˆ: "์ˆ˜์ •"
โœ… ์ข‹์€ ์˜ˆ: "[Feature] ์‚ฌ์šฉ์ž ์•Œ๋ฆผ ์„ค์ • ํŽ˜์ด์ง€ ์ถ”๊ฐ€"

2. ์ƒ์„ธํ•œ ์„ค๋ช…

## ๋ณ€๊ฒฝ ์‚ฌํ•ญ
- ์•Œ๋ฆผ ์„ค์ • ํŽ˜์ด์ง€ UI ๊ตฌํ˜„
- ์ด๋ฉ”์ผ/ํ‘ธ์‹œ ์•Œ๋ฆผ ํ† ๊ธ€ ๊ธฐ๋Šฅ
- ์„ค์ • ์ €์žฅ API ์—ฐ๋™

## ํ…Œ์ŠคํŠธ ๋ฐฉ๋ฒ•
1. /settings/notifications ์ ‘์†
2. ํ† ๊ธ€ ๋ฒ„ํŠผ ํด๋ฆญ
3. ์ €์žฅ ๋ฒ„ํŠผ ํด๋ฆญ
4. ํŽ˜์ด์ง€ ์ƒˆ๋กœ๊ณ ์นจ ํ›„ ์„ค์ • ์œ ์ง€ ํ™•์ธ

## ์Šคํฌ๋ฆฐ์ƒท
[์ด๋ฏธ์ง€ ์ฒจ๋ถ€]

## ๊ด€๋ จ ์ด์Šˆ
Closes #456

3. ์ ์ ˆํ•œ ํฌ๊ธฐ

โ€ข ํ•œ PR์— ๋„ˆ๋ฌด ๋งŽ์€ ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋„ฃ์ง€ ์•Š๊ธฐ
โ€ข ์ด์ƒ์ ์œผ๋กœ๋Š” 200-400์ค„ ์ •๋„
โ€ข ํฐ ๊ธฐ๋Šฅ์€ ์—ฌ๋Ÿฌ PR๋กœ ๋‚˜๋ˆ„๊ธฐ

4. ๋ฆฌ๋ทฐ์–ด ๋ฐฐ๋ ค

โ€ข ๋ณต์žกํ•œ ๋กœ์ง์€ ์ฃผ์„์œผ๋กœ ์„ค๋ช…
โ€ข ์™œ ์ด๋ ‡๊ฒŒ ๊ตฌํ˜„ํ–ˆ๋Š”์ง€ ์ปจํ…์ŠคํŠธ ์ œ๊ณต
โ€ข ๋ฆฌ๋ทฐ ํฌ์ธํŠธ ๋ช…์‹œ

์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฒ ์ŠคํŠธ ํ”„๋ž™ํ‹ฐ์Šค ๐Ÿ‘€

์ฝ”๋“œ ๋ฆฌ๋ทฐ๋Š” ๋‹จ์ˆœํžˆ ๋ฒ„๊ทธ๋ฅผ ์ฐพ๋Š” ๊ฒŒ ์•„๋‹ˆ์•ผ. ํŒ€์˜ ์ฝ”๋“œ ํ’ˆ์งˆ์„ ๋†’์ด๊ณ , ์„œ๋กœ ๋ฐฐ์šฐ๋Š” ์‹œ๊ฐ„์ด์ง€!

๋ฆฌ๋ทฐ์–ด๋กœ์„œ:

โœ… ๊ฑด์„ค์ ์ธ ํ”ผ๋“œ๋ฐฑ
"์ด ์ฝ”๋“œ ๋ณ„๋กœ๋„ค์š”" โŒ
"์ด ๋ถ€๋ถ„์„ ์ด๋ ‡๊ฒŒ ๋ฐ”๊พธ๋ฉด ์„ฑ๋Šฅ์ด ๋” ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š”" โœ…

โœ… ์งˆ๋ฌธํ•˜๊ธฐ
"์™œ ์ด๋ ‡๊ฒŒ ๊ตฌํ˜„ํ•˜์…จ๋‚˜์š”?"
"์ด ๊ฒฝ์šฐ๋Š” ์–ด๋–ป๊ฒŒ ์ฒ˜๋ฆฌ๋˜๋‚˜์š”?"

โœ… ์นญ์ฐฌ๋„ ์žŠ์ง€ ๋ง๊ธฐ
"์ด ๋ถ€๋ถ„ ์ •๋ง ๊น”๋”ํ•˜๋„ค์š”! ๐Ÿ‘"
"์ข‹์€ ์•„์ด๋””์–ด์˜ˆ์š”!"

โœ… ์ค‘์š”๋„ ํ‘œ์‹œ
[Critical] ๋ฐ˜๋“œ์‹œ ์ˆ˜์ • ํ•„์š”
[Suggestion] ์ œ์•ˆ์‚ฌํ•ญ
[Question] ๊ถ๊ธˆํ•œ ์ 

PR ์ž‘์„ฑ์ž๋กœ์„œ:

โœ… ํ”ผ๋“œ๋ฐฑ ์ˆ˜์šฉ
๋ฐฉ์–ด์ ์ด์ง€ ๋ง๊ณ  ์—ด๋ฆฐ ๋งˆ์Œ์œผ๋กœ!

โœ… ๋น ๋ฅธ ์‘๋‹ต
๋ฆฌ๋ทฐ ์ฝ”๋ฉ˜ํŠธ์— 24์‹œ๊ฐ„ ๋‚ด ๋‹ต๋ณ€

โœ… ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋ช…ํ™•ํžˆ
"์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค" โŒ
"์ œ์•ˆํ•˜์‹  ๋Œ€๋กœ ์บ์‹ฑ ๋กœ์ง์„ ์ถ”๊ฐ€ํ–ˆ์Šต๋‹ˆ๋‹ค" โœ…

โš ๏ธ ํ”ํ•œ ์‹ค์ˆ˜์™€ ํ•ด๊ฒฐ๋ฒ•

์‹ค๋ฌด์—์„œ ์ž์ฃผ ๋ฐœ์ƒํ•˜๋Š” ๋ฌธ์ œ๋“ค๊ณผ ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•์„ ์•Œ์•„๋ณด์ž! ๋ฏธ๋ฆฌ ์•Œ๋ฉด ์‚ฝ์งˆ์„ ์ค„์ผ ์ˆ˜ ์žˆ์–ด! ๐Ÿ˜…

1. Merge Conflict ์ง€์˜ฅ ๐Ÿ”ฅ

๋ฌธ์ œ ์ƒํ™ฉ:

๋ธŒ๋žœ์น˜๋ฅผ ์˜ค๋ž˜ ๋ฐฉ์น˜ํ–ˆ๋”๋‹ˆ mergeํ•  ๋•Œ ์ถฉ๋Œ์ด 100๊ฐœ... ๐Ÿ˜ฑ

ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•:

์˜ˆ๋ฐฉ์ด ์ตœ์„ :

# ์ •๊ธฐ์ ์œผ๋กœ main ๋ธŒ๋žœ์น˜ ๋‚ด์šฉ ๊ฐ€์ ธ์˜ค๊ธฐ
git checkout feature/my-feature
git fetch origin
git merge origin/main

# ๋˜๋Š” rebase (ํžˆ์Šคํ† ๋ฆฌ๊ฐ€ ๊น”๋”ํ•ด์ง)
git rebase origin/main

์ถฉ๋Œ ๋ฐœ์ƒ ์‹œ:

# 1. ์ถฉ๋Œ ํŒŒ์ผ ํ™•์ธ
git status

# 2. ํŒŒ์ผ ์—ด์–ด์„œ ์ˆ˜๋™ ์ˆ˜์ •
# <<<<<<< HEAD
# ๋‚ด ์ฝ”๋“œ
# =======
# ๋‹ค๋ฅธ ์‚ฌ๋žŒ ์ฝ”๋“œ
# >>>>>>> branch-name

# 3. ์ˆ˜์ • ํ›„ add
git add ์ถฉ๋ŒํŒŒ์ผ.js

# 4. merge ๊ณ„์†
git merge --continue

๊ฟ€ํŒ:

โ€ข ์ž‘์€ ๋‹จ์œ„๋กœ ์ž์ฃผ mergeํ•˜๊ธฐ
โ€ข ๊ฐ™์€ ํŒŒ์ผ์„ ์—ฌ๋Ÿฌ ๋ช…์ด ๋™์‹œ์— ์ˆ˜์ •ํ•˜์ง€ ์•Š๊ธฐ
โ€ข ์ถฉ๋Œ ๋‚˜๊ธฐ ์ „์— ํŒ€์›๊ณผ ์†Œํ†ตํ•˜๊ธฐ

2. ์ž˜๋ชป๋œ ๋ธŒ๋žœ์น˜์— ์ปค๋ฐ‹ ๐Ÿ˜จ

๋ฌธ์ œ ์ƒํ™ฉ:

main ๋ธŒ๋žœ์น˜์— ์ง์ ‘ ์ปค๋ฐ‹ํ•ด๋ฒ„๋ ธ์–ด... ์–ด๋–กํ•˜์ง€?

ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•:

์•„์ง push ์•ˆ ํ–ˆ๋‹ค๋ฉด:

# 1. ์ƒˆ ๋ธŒ๋žœ์น˜ ๋งŒ๋“ค๊ธฐ (ํ˜„์žฌ ์ปค๋ฐ‹ ํฌํ•จ)
git branch feature/correct-branch

# 2. main์„ ์ด์ „ ์ƒํƒœ๋กœ ๋˜๋Œ๋ฆฌ๊ธฐ
git reset --hard HEAD~1

# 3. ์ƒˆ ๋ธŒ๋žœ์น˜๋กœ ์ด๋™
git checkout feature/correct-branch

์ด๋ฏธ push ํ–ˆ๋‹ค๋ฉด:

# 1. ์ปค๋ฐ‹ ๋˜๋Œ๋ฆฌ๊ธฐ (์ƒˆ ์ปค๋ฐ‹ ์ƒ์„ฑ)
git revert HEAD

# 2. ์˜ฌ๋ฐ”๋ฅธ ๋ธŒ๋žœ์น˜์—์„œ ๋‹ค์‹œ ์ž‘์—…
git checkout -b feature/correct-branch HEAD~1

3. ๋ธŒ๋žœ์น˜๊ฐ€ ๋„ˆ๋ฌด ๋งŽ์•„! ๐ŸŒณ

๋ฌธ์ œ ์ƒํ™ฉ:

git branch ์น˜๋ฉด 100๊ฐœ๊ฐ€ ๋„˜๋Š” ๋ธŒ๋žœ์น˜๊ฐ€... ์–ด๋–ค ๊ฒŒ ์‚ด์•„์žˆ๋Š” ๋ธŒ๋žœ์น˜์ธ์ง€ ๋ชจ๋ฅด๊ฒ ์–ด!

ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•:

๋กœ์ปฌ ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ:

# merge๋œ ๋ธŒ๋žœ์น˜ ํ™•์ธ
git branch --merged

# merge๋œ ๋ธŒ๋žœ์น˜ ์‚ญ์ œ
git branch -d ๋ธŒ๋žœ์น˜๋ช…

# ๋ชจ๋“  merge๋œ ๋ธŒ๋žœ์น˜ ํ•œ๋ฒˆ์— ์‚ญ์ œ (main ์ œ์™ธ)
git branch --merged | grep -v "main" | xargs git branch -d

์›๊ฒฉ ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ:

# ์›๊ฒฉ์—์„œ ์‚ญ์ œ๋œ ๋ธŒ๋žœ์น˜ ๋กœ์ปฌ์—์„œ๋„ ์ œ๊ฑฐ
git fetch --prune

# ์›๊ฒฉ ๋ธŒ๋žœ์น˜ ์‚ญ์ œ
git push origin --delete ๋ธŒ๋žœ์น˜๋ช…

์ •๊ธฐ์ ์ธ ๊ด€๋ฆฌ:

โ€ข PR merge ํ›„ ์ฆ‰์‹œ ๋ธŒ๋žœ์น˜ ์‚ญ์ œ
โ€ข ๋งค์ฃผ ๊ธˆ์š”์ผ ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ ์‹œ๊ฐ„ ๊ฐ–๊ธฐ
โ€ข GitHub/GitLab ์„ค์ •์—์„œ merge ํ›„ ์ž๋™ ์‚ญ์ œ ํ™œ์„ฑํ™”

4. ์‹ค์ˆ˜๋กœ ์ค‘์š”ํ•œ ์ปค๋ฐ‹ ์‚ญ์ œ ๐Ÿ’€

๋ฌธ์ œ ์ƒํ™ฉ:

git reset --hard ํ–ˆ๋Š”๋ฐ ํ•„์š”ํ•œ ์ฝ”๋“œ์˜€์–ด... ๋ณต๊ตฌ ๊ฐ€๋Šฅํ•ด?

ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•:

reflog๋กœ ๋ณต๊ตฌ:

# 1. ๋ชจ๋“  ์ž‘์—… ํžˆ์Šคํ† ๋ฆฌ ํ™•์ธ
git reflog

# 2. ๋Œ์•„๊ฐ€๊ณ  ์‹ถ์€ ์‹œ์ ์˜ ํ•ด์‹œ ์ฐพ๊ธฐ
# ์˜ˆ: abc1234 HEAD@{2}: commit: ์ค‘์š”ํ•œ ์ž‘์—…

# 3. ํ•ด๋‹น ์‹œ์ ์œผ๋กœ ๋ณต๊ตฌ
git reset --hard abc1234

# ๋˜๋Š” ์ƒˆ ๋ธŒ๋žœ์น˜๋กœ ๋ณต๊ตฌ
git checkout -b recovery-branch abc1234

์˜ˆ๋ฐฉ์ฑ…:

โ€ข ์ค‘์š”ํ•œ ์ž‘์—…์€ ํ•ญ์ƒ ์›๊ฒฉ์— push
โ€ข git reset --hard ์‚ฌ์šฉ ์ „ ๋‘ ๋ฒˆ ์ƒ๊ฐํ•˜๊ธฐ
โ€ข ๋ฐฑ์—… ๋ธŒ๋žœ์น˜ ๋งŒ๋“ค์–ด๋‘๊ธฐ

๐Ÿš€ ํŒ€๋ณ„ ๋งž์ถค ๋ธŒ๋žœ์น˜ ์ „๋žต

ํŒ€ ๊ทœ๋ชจ์™€ ํ”„๋กœ์ ํŠธ ํŠน์„ฑ์— ๋”ฐ๋ผ ์ตœ์ ์˜ ์ „๋žต์ด ๋‹ฌ๋ผ! ๋„ˆํฌ ํŒ€์— ๋งž๋Š” ์ „๋žต์„ ์ฐพ์•„๋ณด์ž! ๐ŸŽฏ

์†Œ๊ทœ๋ชจ ์Šคํƒ€ํŠธ์—… (2-5๋ช…) ๐Ÿ‘ฅ

์ถ”์ฒœ: GitHub Flow ๋˜๋Š” ๋‹จ์ˆœํ™”๋œ Git Flow

์ด์œ :

โ€ข ๋น ๋ฅธ ๊ฐœ๋ฐœ๊ณผ ๋ฐฐํฌ๊ฐ€ ์ค‘์š”
โ€ข ๋ณต์žกํ•œ ํ”„๋กœ์„ธ์Šค๋Š” ์˜คํžˆ๋ ค ๋ฐฉํ•ด
โ€ข ๋ชจ๋“  ํŒ€์›์ด ์ „์ฒด ์ฝ”๋“œ๋ฒ ์ด์Šค ํŒŒ์•… ๊ฐ€๋Šฅ

์‹ค์ „ ์ ์šฉ:

# ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ
main (ํ”„๋กœ๋•์…˜)
โ””โ”€โ”€ feature/* (๊ธฐ๋Šฅ ๊ฐœ๋ฐœ)

# ์ž‘์—… ํ๋ฆ„
1. main์—์„œ feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
2. ๊ฐœ๋ฐœ ๋ฐ ํ…Œ์ŠคํŠธ
3. PR ์ƒ์„ฑ (์ตœ์†Œ 1๋ช… ๋ฆฌ๋ทฐ)
4. main์— merge ํ›„ ์ž๋™ ๋ฐฐํฌ

ํŒ:

โ€ข ๋งค์ผ ์•„์นจ ์Šคํƒ ๋“œ์—…์—์„œ ๋ธŒ๋žœ์น˜ ์ƒํ™ฉ ๊ณต์œ 
โ€ข PR์€ 24์‹œ๊ฐ„ ๋‚ด ๋ฆฌ๋ทฐ
โ€ข ์ž‘์€ ๋‹จ์œ„๋กœ ์ž์ฃผ ๋ฐฐํฌ
โ€ข Feature Flag ํ™œ์šฉํ•ด์„œ ๋ฏธ์™„์„ฑ ๊ธฐ๋Šฅ ์ˆจ๊ธฐ๊ธฐ

์ค‘๊ทœ๋ชจ ๊ฐœ๋ฐœํŒ€ (10-30๋ช…) ๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ

์ถ”์ฒœ: Git Flow ๋˜๋Š” GitLab Flow

์ด์œ :

โ€ข ์—ฌ๋Ÿฌ ํŒ€์ด ๋™์‹œ์— ์ž‘์—…
โ€ข ์ฒด๊ณ„์ ์ธ ๋ฆด๋ฆฌ์ฆˆ ๊ด€๋ฆฌ ํ•„์š”
โ€ข QA ํ”„๋กœ์„ธ์Šค ์กด์žฌ
โ€ข ์—ฌ๋Ÿฌ ํ™˜๊ฒฝ(dev, staging, prod) ์šด์˜

์‹ค์ „ ์ ์šฉ:

# ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ
main (ํ”„๋กœ๋•์…˜)
develop (๊ฐœ๋ฐœ ํ†ตํ•ฉ)
โ”œโ”€โ”€ feature/* (๊ธฐ๋Šฅ ๊ฐœ๋ฐœ)
โ”œโ”€โ”€ release/* (๋ฆด๋ฆฌ์ฆˆ ์ค€๋น„)
โ””โ”€โ”€ hotfix/* (๊ธด๊ธ‰ ์ˆ˜์ •)

# ์ž‘์—… ํ๋ฆ„
1. develop์—์„œ feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
2. ๊ฐœ๋ฐœ ์™„๋ฃŒ ํ›„ develop์— merge
3. ์Šคํ”„๋ฆฐํŠธ ์ข…๋ฃŒ ์‹œ release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
4. QA ๋ฐ ๋ฒ„๊ทธ ์ˆ˜์ •
5. main๊ณผ develop์— merge
6. ํƒœ๊ทธ ์ƒ์„ฑ ๋ฐ ๋ฐฐํฌ

ํŒ:

โ€ข 2์ฃผ ์Šคํ”„๋ฆฐํŠธ ๋‹จ์œ„๋กœ ๋ฆด๋ฆฌ์ฆˆ
โ€ข ์ฝ”๋“œ ๋ฆฌ๋ทฐ๋Š” 2๋ช… ์ด์ƒ
โ€ข ์ž๋™ํ™” ํ…Œ์ŠคํŠธ ํ•„์ˆ˜
โ€ข ๋ฆด๋ฆฌ์ฆˆ ๋…ธํŠธ ์ž‘์„ฑ ์Šต๊ด€ํ™”

๋Œ€๊ทœ๋ชจ ์—”ํ„ฐํ”„๋ผ์ด์ฆˆ (50๋ช…+) ๐Ÿข

์ถ”์ฒœ: Git Flow + ์ถ”๊ฐ€ ๊ฑฐ๋ฒ„๋„Œ์Šค

์ด์œ :

โ€ข ์—ฌ๋Ÿฌ ์ œํ’ˆ/์„œ๋น„์Šค ๋™์‹œ ๊ฐœ๋ฐœ
โ€ข ์—„๊ฒฉํ•œ ํ’ˆ์งˆ ๊ด€๋ฆฌ ํ•„์š”
โ€ข ๊ทœ์ œ ์ค€์ˆ˜ ์š”๊ตฌ์‚ฌํ•ญ
โ€ข ๋ณต์žกํ•œ ์˜์กด์„ฑ ๊ด€๋ฆฌ

์‹ค์ „ ์ ์šฉ:

# ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ
main (ํ”„๋กœ๋•์…˜)
develop (๊ฐœ๋ฐœ ํ†ตํ•ฉ)
โ”œโ”€โ”€ feature/* (๊ธฐ๋Šฅ ๊ฐœ๋ฐœ)
โ”‚   โ””โ”€โ”€ feature/team-name/feature-name
โ”œโ”€โ”€ release/* (๋ฆด๋ฆฌ์ฆˆ ์ค€๋น„)
โ”œโ”€โ”€ hotfix/* (๊ธด๊ธ‰ ์ˆ˜์ •)
โ””โ”€โ”€ support/* (๊ตฌ๋ฒ„์ „ ์ง€์›)

# ์ถ”๊ฐ€ ๊ทœ์น™
- ๋ธŒ๋žœ์น˜ ๋ช…๋ช… ๊ทœ์น™ ์—„๊ฒฉํžˆ ์ค€์ˆ˜
- ์ž๋™ํ™”๋œ ์ฝ”๋“œ ํ’ˆ์งˆ ๊ฒ€์‚ฌ
- ํ•„์ˆ˜ ๋ฆฌ๋ทฐ์–ด ์ง€์ •
- ๋ฐฐํฌ ์Šน์ธ ํ”„๋กœ์„ธ์Šค

ํŒ:

โ€ข ๋ธŒ๋žœ์น˜ ๋ณดํ˜ธ ๊ทœ์น™ ์„ค์ •
โ€ข CI/CD ํŒŒ์ดํ”„๋ผ์ธ ์™„๋ฒฝํžˆ ๊ตฌ์ถ•
โ€ข ๋ฌธ์„œํ™” ์ฒ ์ €ํžˆ
โ€ข ์ •๊ธฐ์ ์ธ ๋ธŒ๋žœ์น˜ ์ „๋žต ๋ฆฌ๋ทฐ

์˜คํ”ˆ์†Œ์Šค ํ”„๋กœ์ ํŠธ ๐ŸŒ

์ถ”์ฒœ: GitHub Flow + Fork ๋ชจ๋ธ

์ด์œ :

โ€ข ์™ธ๋ถ€ ๊ธฐ์—ฌ์ž ๊ด€๋ฆฌ
โ€ข ๋ฉ”์ธํ…Œ์ด๋„ˆ์˜ ์ฝ”๋“œ ํ’ˆ์งˆ ๊ด€๋ฆฌ
โ€ข ํˆฌ๋ช…ํ•œ ๊ฐœ๋ฐœ ํ”„๋กœ์„ธ์Šค

์‹ค์ „ ์ ์šฉ:

# ๊ธฐ์—ฌ์ž ์›Œํฌํ”Œ๋กœ์šฐ
1. ์›๋ณธ ์ €์žฅ์†Œ Fork
2. Forkํ•œ ์ €์žฅ์†Œ์—์„œ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
3. ์ž‘์—… ํ›„ ์ปค๋ฐ‹
4. ์›๋ณธ ์ €์žฅ์†Œ์— PR ์ƒ์„ฑ
5. ๋ฉ”์ธํ…Œ์ด๋„ˆ ๋ฆฌ๋ทฐ ๋ฐ merge

# ๋ฉ”์ธํ…Œ์ด๋„ˆ ์›Œํฌํ”Œ๋กœ์šฐ
1. PR ๋ฆฌ๋ทฐ
2. ํ•„์š”์‹œ ์ˆ˜์ • ์š”์ฒญ
3. CI ํ…Œ์ŠคํŠธ ํ†ต๊ณผ ํ™•์ธ
4. Squash merge ๋˜๋Š” Rebase merge
5. ๋ฆด๋ฆฌ์ฆˆ ๋…ธํŠธ ์—…๋ฐ์ดํŠธ

ํŒ:

โ€ข CONTRIBUTING.md ํŒŒ์ผ ์ž‘์„ฑ
โ€ข ์ด์Šˆ ํ…œํ”Œ๋ฆฟ, PR ํ…œํ”Œ๋ฆฟ ์ œ๊ณต
โ€ข ๋ช…ํ™•ํ•œ ์ฝ”๋“œ ์Šคํƒ€์ผ ๊ฐ€์ด๋“œ
โ€ข ์นœ์ ˆํ•œ ์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜

๐Ÿ”ง ์œ ์šฉํ•œ Git ๋„๊ตฌ์™€ ํŒ

๋ธŒ๋žœ์น˜ ๊ด€๋ฆฌ๋ฅผ ๋” ์‰ฝ๊ฒŒ ๋งŒ๋“ค์–ด์ฃผ๋Š” ๋„๊ตฌ๋“ค๊ณผ ๊ฟ€ํŒ์„ ์†Œ๊ฐœํ• ๊ฒŒ! ์ƒ์‚ฐ์„ฑ์ด ํ™• ์˜ฌ๋ผ๊ฐˆ ๊ฑฐ์•ผ! โšก

GUI ๋„๊ตฌ ์ถ”์ฒœ ๐Ÿ–ฅ๏ธ

1. GitKraken

โ€ข ์‹œ๊ฐ์ ์œผ๋กœ ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ ํ™•์ธ
โ€ข ๋“œ๋ž˜๊ทธ ์•ค ๋“œ๋กญ์œผ๋กœ merge/rebase
โ€ข ์ถฉ๋Œ ํ•ด๊ฒฐ ๋„๊ตฌ ๋‚ด์žฅ
โ€ข ๋ฌด๋ฃŒ ๋ฒ„์ „๋„ ์ถฉ๋ถ„ํžˆ ๊ฐ•๋ ฅ

2. SourceTree

โ€ข Atlassian ์ œ๊ณต (๋ฌด๋ฃŒ!)
โ€ข Git Flow ๋ฒ„ํŠผ ํด๋ฆญ์œผ๋กœ ์‚ฌ์šฉ
โ€ข ์ดˆ๋ณด์ž ์นœํ™”์ 
โ€ข Windows, Mac ์ง€์›

3. GitHub Desktop

โ€ข ๊ฐ€์žฅ ์‹ฌํ”Œํ•œ ์ธํ„ฐํŽ˜์ด์Šค
โ€ข GitHub์™€ ์™„๋ฒฝํ•œ ํ†ตํ•ฉ
โ€ข ์ดˆ๋ณด์ž์—๊ฒŒ ์ตœ์ 
โ€ข ๋ฌด๋ฃŒ

4. VS Code Git ํ™•์žฅ

โ€ข GitLens: ์ฝ”๋“œ ๋ผ์ธ๋ณ„ ํžˆ์Šคํ† ๋ฆฌ
โ€ข Git Graph: ๋ธŒ๋žœ์น˜ ์‹œ๊ฐํ™”
โ€ข Git History: ํŒŒ์ผ ํžˆ์Šคํ† ๋ฆฌ ์ถ”์ 
โ€ข ์—๋””ํ„ฐ ์•ˆ์—์„œ ๋ชจ๋“  ์ž‘์—… ๊ฐ€๋Šฅ

ํ„ฐ๋ฏธ๋„ ๊ฟ€ํŒ ๐Ÿ’ป

Git Alias ์„ค์ •ํ•˜๊ธฐ:

# ~/.gitconfig ํŒŒ์ผ์— ์ถ”๊ฐ€
[alias]
    co = checkout
    br = branch
    ci = commit
    st = status
    unstage = reset HEAD --
    last = log -1 HEAD
    visual = log --graph --oneline --all
    undo = reset --soft HEAD~1
    
# ์‚ฌ์šฉ ์˜ˆ์‹œ
git co main  # git checkout main
git br  # git branch
git visual  # ๋ธŒ๋žœ์น˜ ๊ทธ๋ž˜ํ”„ ๋ณด๊ธฐ

์œ ์šฉํ•œ ๋ช…๋ น์–ด ๋ชจ์Œ:

# ํ˜„์žฌ ๋ธŒ๋žœ์น˜ ์ด๋ฆ„๋งŒ ์ถœ๋ ฅ
git branch --show-current

# ์ตœ๊ทผ 5๊ฐœ ๋ธŒ๋žœ์น˜ ๋ณด๊ธฐ
git for-each-ref --count=5 --sort=-committerdate refs/heads/ --format='%(refname:short)'

# ๋ธŒ๋žœ์น˜๋ณ„ ๋งˆ์ง€๋ง‰ ์ปค๋ฐ‹ ์‹œ๊ฐ„
git for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)'

# ํŠน์ • ํŒŒ์ผ์˜ ๋ณ€๊ฒฝ ์ด๋ ฅ
git log --follow -p -- ํŒŒ์ผ๋ช…

# ๋ˆ„๊ฐ€ ์ด ์ฝ”๋“œ๋ฅผ ์ž‘์„ฑํ–ˆ๋Š”์ง€
git blame ํŒŒ์ผ๋ช…

# ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ฒ€์ƒ‰
git log --grep="๊ฒ€์ƒ‰์–ด"

Oh My Zsh + Git ํ”Œ๋Ÿฌ๊ทธ์ธ:

ํ„ฐ๋ฏธ๋„์„ ๋” ์˜ˆ์˜๊ณ  ํŽธํ•˜๊ฒŒ! ํ˜„์žฌ ๋ธŒ๋žœ์น˜, ์ƒํƒœ๋ฅผ ํ”„๋กฌํ”„ํŠธ์— ํ‘œ์‹œํ•ด์ค˜.

์ž๋™ํ™” ๋„๊ตฌ ๐Ÿค–

1. Husky - Git Hooks ๊ด€๋ฆฌ

# ์„ค์น˜
npm install husky --save-dev

# ์ปค๋ฐ‹ ์ „ ์ž๋™ ํ…Œ์ŠคํŠธ
# .husky/pre-commit
npm test
npm run lint

# ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ฒ€์ฆ
# .husky/commit-msg
npx commitlint --edit $1

2. Commitlint - ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ทœ์น™

# commitlint.config.js
module.exports = {
  extends: ['@commitlint/config-conventional'],
  rules: {
    'type-enum': [2, 'always', [
      'feat', 'fix', 'docs', 'style', 
      'refactor', 'test', 'chore'
    ]]
  }
}

3. Semantic Release - ์ž๋™ ๋ฒ„์ „ ๊ด€๋ฆฌ

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ธฐ๋ฐ˜์œผ๋กœ ์ž๋™์œผ๋กœ ๋ฒ„์ „ ๋ฒˆํ˜ธ ์ฆ๊ฐ€, ๋ฆด๋ฆฌ์ฆˆ ๋…ธํŠธ ์ƒ์„ฑ, ํƒœ๊ทธ ์ƒ์„ฑ๊นŒ์ง€!

4. Dependabot - ์˜์กด์„ฑ ์ž๋™ ์—…๋ฐ์ดํŠธ

๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์—…๋ฐ์ดํŠธ๋ฅผ ์ž๋™์œผ๋กœ PR๋กœ ๋งŒ๋“ค์–ด์ค˜. ๋ณด์•ˆ ์ทจ์•ฝ์ ๋„ ์•Œ๋ ค์คŒ!

CI/CD ํ†ตํ•ฉ ๐Ÿ”„

GitHub Actions ์˜ˆ์‹œ:

# .github/workflows/pr-check.yml
name: PR Check
on:
  pull_request:
    branches: [main, develop]

jobs:
  test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: Run tests
        run: npm test
      - name: Run linter
        run: npm run lint
      - name: Check code coverage
        run: npm run coverage

๋ธŒ๋žœ์น˜๋ณ„ ๋ฐฐํฌ ์ž๋™ํ™”:

# .github/workflows/deploy.yml
name: Deploy
on:
  push:
    branches:
      - main        # ํ”„๋กœ๋•์…˜
      - develop     # ์Šคํ…Œ์ด์ง•
      - 'release/*' # ๋ฆด๋ฆฌ์ฆˆ ํ›„๋ณด

jobs:
  deploy:
    runs-on: ubuntu-latest
    steps:
      - name: Deploy to environment
        run: |
          if [[ $GITHUB_REF == 'refs/heads/main' ]]; then
            echo "Deploying to production"
          elif [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
            echo "Deploying to staging"
          fi

๐Ÿ“š ์‹ค์ „ ์‹œ๋‚˜๋ฆฌ์˜ค๋ณ„ ๋Œ€์‘๋ฒ•

์‹ค๋ฌด์—์„œ ๋งˆ์ฃผ์น  ์ˆ˜ ์žˆ๋Š” ๋‹ค์–‘ํ•œ ์ƒํ™ฉ๋“ค๊ณผ ๋Œ€์ฒ˜๋ฒ•์„ ์•Œ์•„๋ณด์ž! ์ด๊ฑด ์ •๋ง ์œ ์šฉํ•  ๊ฑฐ์•ผ! ๐Ÿ’ช

์‹œ๋‚˜๋ฆฌ์˜ค 1: ๊ธด๊ธ‰ ๋ฒ„๊ทธ ๋ฐœ์ƒ! ๐Ÿšจ

์ƒํ™ฉ:

๊ธˆ์š”์ผ ์ €๋… 6์‹œ, ํ”„๋กœ๋•์…˜์—์„œ ๊ฒฐ์ œ๊ฐ€ ์•ˆ ๋œ๋‹ค๋Š” ์ œ๋ณด๊ฐ€ ๋“ค์–ด์™”์–ด! ๐Ÿ˜ฑ

๋Œ€์‘ ๋ฐฉ๋ฒ•:

# 1. ์ฆ‰์‹œ hotfix ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout main
git pull origin main
git checkout -b hotfix/payment-error

# 2. ๋ฒ„๊ทธ ์ˆ˜์ •
# ... ์ฝ”๋“œ ์ˆ˜์ • ...

# 3. ํ…Œ์ŠคํŠธ
npm test
npm run test:e2e

# 4. ์ปค๋ฐ‹ ๋ฐ ํ‘ธ์‹œ
git add .
git commit -m "hotfix: Fix payment processing error"
git push origin hotfix/payment-error

# 5. PR ์ƒ์„ฑ ๋ฐ ๊ธด๊ธ‰ ๋ฆฌ๋ทฐ ์š”์ฒญ
# GitHub/GitLab์—์„œ PR ์ƒ์„ฑ
# ํŒ€์›๋“ค์—๊ฒŒ ์Šฌ๋ž™์œผ๋กœ ๊ธด๊ธ‰ ๋ฆฌ๋ทฐ ์š”์ฒญ

# 6. ์Šน์ธ ํ›„ main์— merge
git checkout main
git merge --no-ff hotfix/payment-error
git tag -a v1.2.1 -m "Hotfix: Payment error"
git push origin main --tags

# 7. develop์—๋„ merge (์ค‘์š”!)
git checkout develop
git merge --no-ff hotfix/payment-error
git push origin develop

# 8. ๋ฐฐํฌ
# CI/CD ํŒŒ์ดํ”„๋ผ์ธ ํŠธ๋ฆฌ๊ฑฐ ๋˜๋Š” ์ˆ˜๋™ ๋ฐฐํฌ

# 9. ๋ธŒ๋žœ์น˜ ์ •๋ฆฌ
git branch -d hotfix/payment-error
git push origin --delete hotfix/payment-error

์ฒดํฌ๋ฆฌ์ŠคํŠธ:

โœ… ๋ฒ„๊ทธ ์žฌํ˜„ ํ™•์ธ
โœ… ์ˆ˜์ • ์‚ฌํ•ญ ํ…Œ์ŠคํŠธ
โœ… ๋ฆด๋ฆฌ์ฆˆ ๋…ธํŠธ ์—…๋ฐ์ดํŠธ
โœ… ๊ณ ๊ฐ ๊ณต์ง€
โœ… ์‚ฌํ›„ ๋ถ„์„ (์™œ ๋ฐœ์ƒํ–ˆ๋Š”์ง€)

์‹œ๋‚˜๋ฆฌ์˜ค 2: ๋Œ€๊ทœ๋ชจ ๋ฆฌํŒฉํ† ๋ง ๐Ÿ”จ

์ƒํ™ฉ:

๋ ˆ๊ฑฐ์‹œ ์ฝ”๋“œ๋ฅผ ํ˜„๋Œ€์ ์œผ๋กœ ๋ฐ”๊พธ๋Š” ๋Œ€๊ทœ๋ชจ ๋ฆฌํŒฉํ† ๋ง ํ”„๋กœ์ ํŠธ. 2์ฃผ ์ •๋„ ๊ฑธ๋ฆด ๊ฒƒ ๊ฐ™์•„.

๋Œ€์‘ ๋ฐฉ๋ฒ•:

# 1. ์žฅ๊ธฐ ์ž‘์—…์šฉ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout develop
git checkout -b refactor/modernize-codebase

# 2. ์ž‘์€ ๋‹จ์œ„๋กœ ๋‚˜๋ˆ ์„œ ์ž‘์—…
git checkout -b refactor/modernize-codebase-step1
# ... ์ž‘์—… ...
git commit -m "refactor: Update authentication module"
git push origin refactor/modernize-codebase-step1

# 3. ๋ฉ”์ธ ๋ฆฌํŒฉํ† ๋ง ๋ธŒ๋žœ์น˜์— merge
git checkout refactor/modernize-codebase
git merge refactor/modernize-codebase-step1

# 4. ์ •๊ธฐ์ ์œผ๋กœ develop ๋‚ด์šฉ ๊ฐ€์ ธ์˜ค๊ธฐ (์ถฉ๋Œ ์ตœ์†Œํ™”)
git fetch origin
git merge origin/develop
# ์ถฉ๋Œ ํ•ด๊ฒฐ

# 5. ์ค‘๊ฐ„ ๊ฒ€ํ†  PR ์ƒ์„ฑ
# Draft PR๋กœ ๋งŒ๋“ค์–ด์„œ ํŒ€์›๋“ค์—๊ฒŒ ํ”ผ๋“œ๋ฐฑ ๋ฐ›๊ธฐ

# 6. ๋ชจ๋“  ์ž‘์—… ์™„๋ฃŒ ํ›„ ์ตœ์ข… PR
git push origin refactor/modernize-codebase
# PR ์ƒ์„ฑ ๋ฐ ์ƒ์„ธํ•œ ์„ค๋ช… ์ž‘์„ฑ

ํŒ:

โ€ข Feature Flag๋กœ ์ ์ง„์  ๋กค์•„์›ƒ
โ€ข ๋งค์ผ develop๊ณผ sync
โ€ข ์ค‘๊ฐ„์ค‘๊ฐ„ ํŒ€์›๋“ค๊ณผ ๋ฆฌ๋ทฐ
โ€ข ๋ฌธ์„œํ™” ์ฒ ์ €ํžˆ

์‹œ๋‚˜๋ฆฌ์˜ค 3: ์—ฌ๋Ÿฌ ๋ฒ„์ „ ๋™์‹œ ์ง€์› ๐Ÿ“ฆ

์ƒํ™ฉ:

v1.0, v2.0, v3.0์„ ๋™์‹œ์— ์ง€์›ํ•ด์•ผ ํ•ด. ๊ฐ ๋ฒ„์ „๋ณ„๋กœ ๋ฒ„๊ทธ ์ˆ˜์ •์ด ํ•„์š”ํ•  ์ˆ˜ ์žˆ์–ด.

๋Œ€์‘ ๋ฐฉ๋ฒ•:

# ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ
main (์ตœ์‹  ๋ฒ„์ „, v3.0)
โ”œโ”€โ”€ support/v2.x (v2.0 ์ง€์›)
โ””โ”€โ”€ support/v1.x (v1.0 ์ง€์›)

# v2.0์— ๋ฒ„๊ทธ ์ˆ˜์ •์ด ํ•„์š”ํ•œ ๊ฒฝ์šฐ
git checkout support/v2.x
git checkout -b hotfix/v2-security-patch
# ... ์ˆ˜์ • ...
git commit -m "fix: Security patch for v2.x"
git checkout support/v2.x
git merge hotfix/v2-security-patch
git tag -a v2.5.1 -m "Security patch"
git push origin support/v2.x --tags

# ํ•„์š”ํ•˜๋‹ค๋ฉด ์ตœ์‹  ๋ฒ„์ „์—๋„ ์ ์šฉ
git checkout main
git cherry-pick <commit-hash>

์‹œ๋‚˜๋ฆฌ์˜ค 4: ์‹คํ—˜์  ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๐Ÿงช

์ƒํ™ฉ:

์ƒˆ๋กœ์šด AI ๊ธฐ๋Šฅ์„ ์‹คํ—˜ ์ค‘์ธ๋ฐ, ์„ฑ๊ณตํ• ์ง€ ํ™•์‹คํ•˜์ง€ ์•Š์•„. ํ•˜์ง€๋งŒ ๋‹ค๋ฅธ ๊ฐœ๋ฐœ์€ ๊ณ„์†๋˜์–ด์•ผ ํ•ด.

๋Œ€์‘ ๋ฐฉ๋ฒ•:

# 1. ์‹คํ—˜์šฉ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout develop
git checkout -b experiment/ai-recommendations

# 2. Feature Flag ์„ค์ •
# config.js
const features = {
  aiRecommendations: process.env.ENABLE_AI === 'true'
};

# 3. ์ฝ”๋“œ์—์„œ Feature Flag ์‚ฌ์šฉ
if (features.aiRecommendations) {
  // AI ์ถ”์ฒœ ๋กœ์ง
} else {
  // ๊ธฐ์กด ๋กœ์ง
}

# 4. ์‹คํ—˜ ๋ธŒ๋žœ์น˜๋ฅผ develop์— merge
# ํ•˜์ง€๋งŒ Feature Flag๋Š” ๊บผ์ง„ ์ƒํƒœ๋กœ ๋ฐฐํฌ

# 5. ํ”„๋กœ๋•์…˜์—์„œ ์ผ๋ถ€ ์‚ฌ์šฉ์ž์—๊ฒŒ๋งŒ ํ…Œ์ŠคํŠธ
# A/B ํ…Œ์ŠคํŠธ ์ง„ํ–‰

# 6. ์„ฑ๊ณตํ•˜๋ฉด Feature Flag ์ œ๊ฑฐํ•˜๊ณ  ์ •์‹ ๊ธฐ๋Šฅ์œผ๋กœ
# ์‹คํŒจํ•˜๋ฉด ์ฝ”๋“œ๋งŒ ์ œ๊ฑฐํ•˜๊ณ  ๋ธŒ๋žœ์น˜ ์‚ญ์ œ

Feature Flag ๋„๊ตฌ:

โ€ข LaunchDarkly
โ€ข Unleash
โ€ข Firebase Remote Config
โ€ข ์ž์ฒด ๊ตฌํ˜„ (๊ฐ„๋‹จํ•œ ๊ฒฝ์šฐ)

๐ŸŽ“ ํŒ€์— ๋ธŒ๋žœ์น˜ ์ „๋žต ๋„์ž…ํ•˜๊ธฐ

์ด๋ก ์€ ์™„๋ฒฝํ•œ๋ฐ, ์‹ค์ œ๋กœ ํŒ€์— ์ ์šฉํ•˜๋ ค๋‹ˆ ๋ง‰๋ง‰ํ•˜์ง€? ๋‹จ๊ณ„๋ณ„๋กœ ์ฐจ๊ทผ์ฐจ๊ทผ ๋„์ž…ํ•˜๋Š” ๋ฐฉ๋ฒ•์„ ์•Œ๋ ค์ค„๊ฒŒ! ๐Ÿš€

Step 1: ํ˜„์žฌ ์ƒํ™ฉ ๋ถ„์„ ๐Ÿ“Š

์ฒดํฌ๋ฆฌ์ŠคํŠธ:

โœ… ํŒ€ ๊ทœ๋ชจ๋Š”? (2-5๋ช… / 5-15๋ช… / 15๋ช…+)
โœ… ๋ฐฐํฌ ์ฃผ๊ธฐ๋Š”? (๋งค์ผ / ๋งค์ฃผ / ๋งค์›”)
โœ… ํŒ€์›๋“ค์˜ Git ์ˆ™๋ จ๋„๋Š”?
โœ… ํ˜„์žฌ ๊ฒช๊ณ  ์žˆ๋Š” ๋ฌธ์ œ๋Š”?
โœ… CI/CD ํŒŒ์ดํ”„๋ผ์ธ ์žˆ์–ด?
โœ… ์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฌธํ™” ์žˆ์–ด?

๋ฌธ์ œ ํŒŒ์•…:

โ€ข "๋ฐฐํฌํ•  ๋•Œ๋งˆ๋‹ค ๋ฒ„๊ทธ๊ฐ€ ์ƒ๊ฒจ์š”" โ†’ ๋ฆด๋ฆฌ์ฆˆ ๋ธŒ๋žœ์น˜ ํ•„์š”
โ€ข "๋ˆ„๊ฐ€ ๋ญ˜ ์ž‘์—… ์ค‘์ธ์ง€ ๋ชจ๋ฅด๊ฒ ์–ด์š”" โ†’ ๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ ๊ทœ์น™ ํ•„์š”
โ€ข "์ถฉ๋Œ์ด ๋„ˆ๋ฌด ์ž์ฃผ ๋‚˜์š”" โ†’ ์ž‘์€ ๋‹จ์œ„๋กœ ์ž์ฃผ merge
โ€ข "๊ธ‰ํ•œ ๋ฒ„๊ทธ ์ˆ˜์ •์ด ์–ด๋ ค์›Œ์š”" โ†’ hotfix ํ”„๋กœ์„ธ์Šค ํ•„์š”

Step 2: ์ „๋žต ์„ ํƒ ๋ฐ ์ปค์Šคํ„ฐ๋งˆ์ด์ง• ๐ŸŽฏ

ํŒ€ ๊ทœ๋ชจ๋ณ„ ์ถ”์ฒœ:

์†Œ๊ทœ๋ชจ (2-5๋ช…):

main
โ””โ”€โ”€ feature/*

๊ทœ์น™:
- PR ํ•„์ˆ˜
- 1๋ช… ์ด์ƒ ๋ฆฌ๋ทฐ
- ์ž๋™ ํ…Œ์ŠคํŠธ ํ†ต๊ณผ
- main์— merge ํ›„ ์ฆ‰์‹œ ๋ฐฐํฌ

์ค‘๊ทœ๋ชจ (5-15๋ช…):

main
develop
โ”œโ”€โ”€ feature/*
โ”œโ”€โ”€ release/*
โ””โ”€โ”€ hotfix/*

๊ทœ์น™:
- develop์—์„œ ์ž‘์—…
- 2์ฃผ๋งˆ๋‹ค release
- 2๋ช… ์ด์ƒ ๋ฆฌ๋ทฐ
- QA ํ”„๋กœ์„ธ์Šค ํฌํ•จ

๋Œ€๊ทœ๋ชจ (15๋ช…+):

main
develop
โ”œโ”€โ”€ feature/ํŒ€๋ช…/*
โ”œโ”€โ”€ release/*
โ”œโ”€โ”€ hotfix/*
โ””โ”€โ”€ support/*

๊ทœ์น™:
- ํŒ€๋ณ„ ๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ
- ํ•„์ˆ˜ ๋ฆฌ๋ทฐ์–ด ์ง€์ •
- ์ž๋™ํ™”๋œ ํ’ˆ์งˆ ๊ฒ€์‚ฌ
- ์Šน์ธ ํ”„๋กœ์„ธ์Šค

Step 3: ๋ฌธ์„œํ™” ๐Ÿ“

BRANCHING.md ํŒŒ์ผ ์ž‘์„ฑ:

# ๋ธŒ๋žœ์น˜ ์ „๋žต

## ๋ธŒ๋žœ์น˜ ์ข…๋ฅ˜

### main
- ํ”„๋กœ๋•์…˜ ๋ฐฐํฌ ๋ธŒ๋žœ์น˜
- ์ง์ ‘ ์ปค๋ฐ‹ ๊ธˆ์ง€
- ํƒœ๊ทธ๋กœ ๋ฒ„์ „ ๊ด€๋ฆฌ

### develop
- ๊ฐœ๋ฐœ ํ†ตํ•ฉ ๋ธŒ๋žœ์น˜
- ๋ชจ๋“  feature๊ฐ€ ์—ฌ๊ธฐ๋กœ merge

### feature/*
- ์ƒˆ ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ
- develop์—์„œ ๋ถ„๊ธฐ
- ๋„ค์ด๋ฐ: feature/๊ธฐ๋Šฅ๋ช…

## ์ž‘์—… ํ๋ฆ„

1. ์ด์Šˆ ์ƒ์„ฑ
2. feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
3. ๊ฐœ๋ฐœ ๋ฐ ์ปค๋ฐ‹
4. PR ์ƒ์„ฑ
5. ์ฝ”๋“œ ๋ฆฌ๋ทฐ
6. develop์— merge
7. ๋ธŒ๋žœ์น˜ ์‚ญ์ œ

## ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ทœ์น™

ํƒ€์ž…: ์ œ๋ชฉ

- feat: ์ƒˆ ๊ธฐ๋Šฅ
- fix: ๋ฒ„๊ทธ ์ˆ˜์ •
- docs: ๋ฌธ์„œ ์ˆ˜์ •
- refactor: ๋ฆฌํŒฉํ† ๋ง

## ์˜ˆ์‹œ

```bash
git checkout develop
git pull origin develop
git checkout -b feature/user-profile
# ... ์ž‘์—… ...
git commit -m "feat: Add user profile page"
git push origin feature/user-profile
# PR ์ƒ์„ฑ
```

Step 4: ๊ต์œก ๋ฐ ์˜จ๋ณด๋”ฉ ๐Ÿ‘จโ€๐Ÿซ

ํŒ€ ์›Œํฌ์ƒต ์ง„ํ–‰:

1์ฃผ์ฐจ: ๊ธฐ๋ณธ ๊ฐœ๋…

โ€ข Git ๊ธฐ์ดˆ ๋ณต์Šต
โ€ข ๋ธŒ๋žœ์น˜ ์ „๋žต ์†Œ๊ฐœ
โ€ข ์‹ค์Šต: ๊ฐ„๋‹จํ•œ feature ๋ธŒ๋žœ์น˜ ๋งŒ๋“ค๊ธฐ

2์ฃผ์ฐจ: ์‹ค์ „ ์—ฐ์Šต

โ€ข ์‹ค์ œ ํ”„๋กœ์ ํŠธ์— ์ ์šฉ
โ€ข PR ์ž‘์„ฑ ๋ฐ ๋ฆฌ๋ทฐ ์—ฐ์Šต
โ€ข ์ถฉ๋Œ ํ•ด๊ฒฐ ์‹ค์Šต

3์ฃผ์ฐจ: ๊ณ ๊ธ‰ ๊ธฐ๋Šฅ

โ€ข Rebase vs Merge
โ€ข Cherry-pick ํ™œ์šฉ
โ€ข Git hooks ์„ค์ •

์ง€์†์ ์ธ ์ง€์›:

โ€ข ์Šฌ๋ž™ ์ฑ„๋„ ๋งŒ๋“ค๊ธฐ (#git-help)
โ€ข ์ฃผ๊ฐ„ Q&A ์„ธ์…˜
โ€ข ํŽ˜์–ด ํ”„๋กœ๊ทธ๋ž˜๋ฐ์œผ๋กœ ๋ฉ˜ํ† ๋ง

Step 5: ์ ์ง„์  ๋„์ž… ๐Ÿข

Phase 1: ๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ๋ถ€ํ„ฐ

์ผ๋‹จ ๋ธŒ๋žœ์น˜ ์ด๋ฆ„๋งŒ ํ†ต์ผํ•˜๋Š” ๊ฒƒ๋ถ€ํ„ฐ ์‹œ์ž‘! ๋„ˆ๋ฌด ๋งŽ์€ ๊ฑธ ํ•œ๋ฒˆ์— ๋ฐ”๊พธ๋ฉด ํ˜ผ๋ž€์Šค๋Ÿฌ์›Œ.

Phase 2: PR ํ”„๋กœ์„ธ์Šค ๋„์ž…

๋ชจ๋“  ๋ณ€๊ฒฝ์‚ฌํ•ญ์€ PR์„ ํ†ตํ•ด. ์ฒ˜์Œ์—” ๋ฆฌ๋ทฐ ์—†์ด mergeํ•ด๋„ OK.

Phase 3: ์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฌธํ™”

์ด์ œ ๋ฆฌ๋ทฐ๋ฅผ ํ•„์ˆ˜๋กœ! ์ฒ˜์Œ์—” ๋ถ€๋‹ด์Šค๋Ÿฌ์šธ ์ˆ˜ ์žˆ์œผ๋‹ˆ ๊ฐ€๋ณ๊ฒŒ ์‹œ์ž‘.

Phase 4: ์ž๋™ํ™” ์ถ”๊ฐ€

CI/CD, ์ž๋™ ํ…Œ์ŠคํŠธ, ๋ฆฐํ„ฐ ๋“ฑ์„ ํ•˜๋‚˜์”ฉ ์ถ”๊ฐ€.

Phase 5: ๊ณ ๋„ํ™”

Feature Flag, ์ž๋™ ๋ฐฐํฌ, ๋ชจ๋‹ˆํ„ฐ๋ง ๋“ฑ ๊ณ ๊ธ‰ ๊ธฐ๋Šฅ ๋„์ž….

Step 6: ์ง€์†์ ์ธ ๊ฐœ์„  ๐Ÿ”„

์ •๊ธฐ ํšŒ๊ณ :

๋งค์›” ๋ธŒ๋žœ์น˜ ์ „๋žต ํšŒ๊ณ :

โ€ข ์ž˜ ์ž‘๋™ํ•˜๋Š” ๊ฒƒ์€?
โ€ข ๋ถˆํŽธํ•œ ์ ์€?
โ€ข ๊ฐœ์„ ํ•  ์ ์€?
โ€ข ๋‹ค์Œ ๋‹ฌ ์‹คํ—˜ํ•  ๊ฒƒ์€?

๋ฉ”ํŠธ๋ฆญ ์ถ”์ :

โ€ข PR ํ‰๊ท  ๋ฆฌ๋ทฐ ์‹œ๊ฐ„
โ€ข ๋ธŒ๋žœ์น˜ ํ‰๊ท  ์ˆ˜๋ช…
โ€ข ๋ฐฐํฌ ๋นˆ๋„
โ€ข ๋ฒ„๊ทธ ๋ฐœ์ƒ๋ฅ 
โ€ข ๋กค๋ฐฑ ํšŸ์ˆ˜

์„ฑ๊ณต ์‚ฌ๋ก€ ๊ณต์œ :

"์ด๋ฒˆ ์ฃผ ๋ฒ ์ŠคํŠธ PR"์„ ์„ ์ •ํ•ด์„œ ํŒ€ ๋ฏธํŒ…์—์„œ ๊ณต์œ ํ•˜๋ฉด ๋™๊ธฐ๋ถ€์—ฌ๊ฐ€ ๋ผ!

๐Ÿ’ก ์žฌ๋Šฅ๋„ท์—์„œ Git ์ „๋ฌธ๊ฐ€ ์ฐพ๊ธฐ

ํ˜ผ์ž ๊ณต๋ถ€ํ•˜๋‹ค ๋ง‰ํžˆ๋Š” ๋ถ€๋ถ„์ด ์žˆ๊ฑฐ๋‚˜, ํŒ€์— ๋งž๋Š” ๋ธŒ๋žœ์น˜ ์ „๋žต์„ ์ปจ์„คํŒ…๋ฐ›๊ณ  ์‹ถ๋‹ค๋ฉด? ์žฌ๋Šฅ๋„ท์„ ํ™œ์šฉํ•ด๋ณด๋Š” ๊ฒƒ๋„ ์ข‹์€ ๋ฐฉ๋ฒ•์ด์•ผ! ๐ŸŽฏ

์žฌ๋Šฅ๋„ท์—์„œ ์ด๋Ÿฐ ๋„์›€์„ ๋ฐ›์„ ์ˆ˜ ์žˆ์–ด:

๐ŸŽ“ 1:1 Git ๋ฉ˜ํ† ๋ง
์‹ค๋ฌด ๊ฒฝํ—˜์ด ํ’๋ถ€ํ•œ ๊ฐœ๋ฐœ์ž์—๊ฒŒ ์ง์ ‘ ๋ฐฐ์šธ ์ˆ˜ ์žˆ์–ด. ๋„ˆ์˜ ํ”„๋กœ์ ํŠธ ์ƒํ™ฉ์— ๋งž๋Š” ๋งž์ถคํ˜• ์กฐ์–ธ์„ ๋ฐ›์„ ์ˆ˜ ์žˆ์ง€!

๐Ÿข ํŒ€ ๋ธŒ๋žœ์น˜ ์ „๋žต ์ปจ์„คํŒ…
๋„ˆํฌ ํŒ€์˜ ๊ทœ๋ชจ, ํ”„๋กœ์ ํŠธ ํŠน์„ฑ, ๊ฐœ๋ฐœ ๋ฌธํ™”๋ฅผ ๋ถ„์„ํ•ด์„œ ์ตœ์ ์˜ ๋ธŒ๋žœ์น˜ ์ „๋žต์„ ์ œ์•ˆ๋ฐ›์„ ์ˆ˜ ์žˆ์–ด.

๐Ÿ”ง CI/CD ํŒŒ์ดํ”„๋ผ์ธ ๊ตฌ์ถ•
๋ธŒ๋žœ์น˜ ์ „๋žต๊ณผ ํ•จ๊ป˜ ์ž๋™ํ™” ์‹œ์Šคํ…œ์„ ๊ตฌ์ถ•ํ•˜๊ณ  ์‹ถ๋‹ค๋ฉด, ์ „๋ฌธ๊ฐ€์˜ ๋„์›€์„ ๋ฐ›์•„๋ณด์ž!

๐Ÿ“š ํŒ€ ๊ต์œก ํ”„๋กœ๊ทธ๋žจ
ํŒ€ ์ „์ฒด๋ฅผ ๋Œ€์ƒ์œผ๋กœ Git๊ณผ ๋ธŒ๋žœ์น˜ ์ „๋žต ๊ต์œก์„ ์ง„ํ–‰ํ•ด์ค„ ์ „๋ฌธ๊ฐ€๋ฅผ ์ฐพ์„ ์ˆ˜ ์žˆ์–ด.

๐Ÿ’ป ์ฝ”๋“œ ๋ฆฌ๋ทฐ ์„œ๋น„์Šค
๋„ˆ์˜ ๋ธŒ๋žœ์น˜ ๊ตฌ์กฐ์™€ Git ์‚ฌ์šฉ ๋ฐฉ์‹์„ ๋ฆฌ๋ทฐ๋ฐ›๊ณ  ๊ฐœ์„ ์ ์„ ์ฐพ์„ ์ˆ˜ ์žˆ์–ด.

์žฌ๋Šฅ๋„ท(https://www.jaenung.net)์—์„œ 'Git', '๋ธŒ๋žœ์น˜ ์ „๋žต', 'DevOps' ๊ฐ™์€ ํ‚ค์›Œ๋“œ๋กœ ๊ฒ€์ƒ‰ํ•ด๋ณด๋ฉด ๋‹ค์–‘ํ•œ ์ „๋ฌธ๊ฐ€๋“ค์„ ๋งŒ๋‚  ์ˆ˜ ์žˆ์–ด. ์‹ค๋ฌด์—์„œ ๋ฐ”๋กœ ์จ๋จน์„ ์ˆ˜ ์žˆ๋Š” ์‹ค์ „ ๋…ธํ•˜์šฐ๋ฅผ ๋ฐฐ์šธ ์ˆ˜ ์žˆ๋Š” ์ข‹์€ ๊ธฐํšŒ์•ผ! ๐Ÿ˜Š

๐ŸŽฏ ๋งˆ๋ฌด๋ฆฌํ•˜๋ฉฐ

์ž, ์—ฌ๊ธฐ๊นŒ์ง€ Git ๋ธŒ๋žœ์น˜ ์ „๋žต์— ๋Œ€ํ•ด ๊นŠ์ด ์žˆ๊ฒŒ ์•Œ์•„๋ดค์–ด! ์ฒ˜์Œ์—” ๋ณต์žกํ•ด ๋ณด์ผ ์ˆ˜ ์žˆ์ง€๋งŒ, ํ•˜๋‚˜์”ฉ ์ ์šฉํ•˜๋‹ค ๋ณด๋ฉด ์–ด๋А์ƒˆ ์ž์—ฐ์Šค๋Ÿฝ๊ฒŒ ๋ชธ์— ๋ฐฐ๊ฒŒ ๋  ๊ฑฐ์•ผ. ๐ŸŒŸ

ํ•ต์‹ฌ ์š”์•ฝ ์ •๋ฆฌ:

1. ๋ธŒ๋žœ์น˜ ์ „๋žต์€ ํŒ€์˜ ์ƒํ™ฉ์— ๋งž๊ฒŒ

์™„๋ฒฝํ•œ ์ „๋žต์€ ์—†์–ด. ๋„ˆํฌ ํŒ€์— ๋งž๋Š” ์ „๋žต์„ ์ฐพ๊ณ , ๊ณ„์† ๊ฐœ์„ ํ•ด๋‚˜๊ฐ€๋Š” ๊ฒŒ ์ค‘์š”ํ•ด!

2. ์ž‘๊ฒŒ ์‹œ์ž‘ํ•ด์„œ ์ ์ง„์ ์œผ๋กœ

ํ•œ ๋ฒˆ์— ๋ชจ๋“  ๊ฑธ ๋ฐ”๊พธ๋ ค๊ณ  ํ•˜์ง€ ๋งˆ. ๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ๋ถ€ํ„ฐ ์‹œ์ž‘ํ•ด์„œ ํ•˜๋‚˜์”ฉ ์ถ”๊ฐ€ํ•ด๋‚˜๊ฐ€์ž.

3. ์ž๋™ํ™”๊ฐ€ ํ•ต์‹ฌ

์‚ฌ๋žŒ์ด ์‹ค์ˆ˜ํ•  ์ˆ˜ ์žˆ๋Š” ๋ถ€๋ถ„์€ ์ž๋™ํ™”๋กœ ํ•ด๊ฒฐ! CI/CD, ํ…Œ์ŠคํŠธ, ๋ฆฐํ„ฐ ๋“ฑ์„ ์ ๊ทน ํ™œ์šฉํ•˜์ž.

4. ์†Œํ†ต์ด ๊ฐ€์žฅ ์ค‘์š”

์•„๋ฌด๋ฆฌ ์ข‹์€ ์ „๋žต๋„ ํŒ€์›๋“ค์ด ์ดํ•ดํ•˜๊ณ  ๋”ฐ๋ฅด์ง€ ์•Š์œผ๋ฉด ์†Œ์šฉ์—†์–ด. ์ถฉ๋ถ„ํžˆ ์†Œํ†ตํ•˜๊ณ  ๊ต์œกํ•˜์ž!

5. ์ง€์†์ ์ธ ๊ฐœ์„ 

์ •๊ธฐ์ ์œผ๋กœ ํšŒ๊ณ ํ•˜๊ณ , ๋ถˆํŽธํ•œ ์ ์„ ๊ฐœ์„ ํ•ด๋‚˜๊ฐ€์ž. ๋ธŒ๋žœ์น˜ ์ „๋žต์€ ์‚ด์•„์žˆ๋Š” ๋ฌธ์„œ์•ผ!

Happy Branching! ์„ฑ๊ณต์ ์ธ ํ˜‘์—…์„ ์œ„ํ•˜์—ฌ

๊ธฐ์–ตํ•ด! Git ๋ธŒ๋žœ์น˜ ์ „๋žต์€ ๋„๊ตฌ์ผ ๋ฟ์ด์•ผ. ๋ชฉ์ ์€ ํŒ€์ด ๋” ํšจ์œจ์ ์œผ๋กœ ํ˜‘์—…ํ•˜๊ณ , ๋” ์ข‹์€ ์ฝ”๋“œ๋ฅผ ๋งŒ๋“ค๊ณ , ๋” ๋น ๋ฅด๊ฒŒ ๊ฐ€์น˜๋ฅผ ์ „๋‹ฌํ•˜๋Š” ๊ฑฐ์ง€. ์ „๋žต์— ๋„ˆ๋ฌด ์–ฝ๋งค์ด์ง€ ๋ง๊ณ , ์œ ์—ฐํ•˜๊ฒŒ ์ ์šฉํ•˜์ž! ๐Ÿ’ช

ํ˜น์‹œ ๋” ๊ถ๊ธˆํ•œ ๊ฒŒ ์žˆ๊ฑฐ๋‚˜, ๋„ˆํฌ ํŒ€ ์ƒํ™ฉ์— ๋งž๋Š” ์กฐ์–ธ์ด ํ•„์š”ํ•˜๋‹ค๋ฉด ์žฌ๋Šฅ๋„ท์—์„œ ์ „๋ฌธ๊ฐ€๋ฅผ ์ฐพ์•„๋ณด๋Š” ๊ฒƒ๋„ ์ข‹์€ ๋ฐฉ๋ฒ•์ด์•ผ. ์‹ค๋ฌด ๊ฒฝํ—˜์ด ํ’๋ถ€ํ•œ ๊ฐœ๋ฐœ์ž๋“ค์ด ๋„ˆ์˜ ๊ณ ๋ฏผ์„ ํ•ด๊ฒฐํ•ด์ค„ ์ˆ˜ ์žˆ์„ ๊ฑฐ์•ผ! ๐Ÿš€

๐Ÿ’ก ๋งˆ์ง€๋ง‰ ํŒ: Git์€ ์—ฐ์Šต์ด ๋‹ต์ด์•ผ! ๊ฐœ์ธ ํ”„๋กœ์ ํŠธ๋‚˜ ํ† ์ด ํ”„๋กœ์ ํŠธ๋กœ ๋‹ค์–‘ํ•œ ๋ธŒ๋žœ์น˜ ์ „๋žต์„ ์‹คํ—˜ํ•ด๋ณด์ž. ์‹ค์ˆ˜ํ•ด๋„ ๊ดœ์ฐฎ์•„, ๊ทธ๊ฒŒ ๋ฐฐ์šฐ๋Š” ๊ณผ์ •์ด๋‹ˆ๊นŒ! ๐Ÿ˜Š

ํ–‰๋ณตํ•œ ์ฝ”๋”ฉ ๋˜๊ธธ ๋ฐ”๋ผ! ๐ŸŽ‰
๊ทธ๋ฆฌ๊ณ  ํ•ญ์ƒ ๊ธฐ์–ตํ•ด: git commit -m "Keep learning and growing!" โœจ

๋Œ“๊ธ€ ์ž‘์„ฑ

์ด ๊ธ€์— ๋Œ€ํ•œ ์—ฌ๋Ÿฌ๋ถ„์˜ ์ƒ๊ฐ์„ ๋“ค๋ ค์ฃผ์„ธ์š”

๋Œ“๊ธ€ 0
๋Œ“๊ธ€์„ ๋ถˆ๋Ÿฌ์˜ค๋Š” ์ค‘์ž…๋‹ˆ๋‹ค.

์•„์ง ๋Œ“๊ธ€์ด ์—†์Šต๋‹ˆ๋‹ค.