Skip to content

Latest commit

ย 

History

History
65 lines (49 loc) ยท 2.06 KB

File metadata and controls

65 lines (49 loc) ยท 2.06 KB

๋ฉ‹์‚ฌ ์ค‘์•™ํ•ด์ปคํ†ค

2025/07/21 ~ 2025/08/25


๐ŸŽฏ Git Convention

  • ๐ŸŽ‰ Start: Start New Project [:tada:]
  • โœจ Feat: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ [:sparkles:]
  • ๐Ÿ› Fix: ๋ฒ„๊ทธ ์ˆ˜์ • [:bug:]
  • ๐ŸŽจ Design: CSS ๋“ฑ ์‚ฌ์šฉ์ž UI ๋””์ž์ธ ๋ณ€๊ฒฝ [:art:]
  • โ™ป๏ธ Refactor: ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง [:recycle:]
  • ๐Ÿ”ง Settings: Changing configuration files [:wrench:]
  • ๐Ÿ—ƒ๏ธ Comment: ํ•„์š”ํ•œ ์ฃผ์„ ์ถ”๊ฐ€ ๋ฐ ๋ณ€๊ฒฝ [:card_file_box:]
  • โž• Dependency/Plugin: Add a dependency/plugin [:heavy_plus_sign:]
  • ๐Ÿ“ Docs: ๋ฌธ์„œ ์ˆ˜์ • [:memo:]
  • ๐Ÿ”€ Merge: Merge branches [:twisted_rightwards_arrows:]
  • ๐Ÿš€ Deploy: Deploying stuff [:rocket:]
  • ๐Ÿšš Rename: ํŒŒ์ผ ํ˜น์€ ํด๋”๋ช…์„ ์ˆ˜์ •ํ•˜๊ฑฐ๋‚˜ ์˜ฎ๊ธฐ๋Š” ์ž‘์—…๋งŒ์ธ ๊ฒฝ์šฐ [:truck:]
  • ๐Ÿ”ฅ Remove: ํŒŒ์ผ์„ ์‚ญ์ œํ•˜๋Š” ์ž‘์—…๋งŒ ์ˆ˜ํ–‰ํ•œ ๊ฒฝ์šฐ [:fire:]
  • โช๏ธ Revert: ์ „ ๋ฒ„์ „์œผ๋กœ ๋กค๋ฐฑ [:rewind:]

๐Ÿ“ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ํ˜•์‹

ํ˜•์‹: ์ž‘์—… ๋‚ด์šฉ ์š”์•ฝ

์˜ˆ:
โœจ Feat: ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„
๐Ÿ› Fix: ๋กœ๊ทธ์ธ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ


๐Ÿชด Branch Convention (GitHub Flow)

  • main: ๋ฐฐํฌ ๊ฐ€๋Šฅํ•œ ๋ธŒ๋žœ์น˜, ํ•ญ์ƒ ๋ฐฐํฌ ๊ฐ€๋Šฅํ•œ ์ƒํƒœ๋ฅผ ์œ ์ง€
  • develop: ๊ฐœ๋ฐœ ์ค‘ ์‚ฌ์šฉํ•  ๋ธŒ๋žœ์น˜
  • feature/{description}: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
    • ์˜ˆ: feature/add-login-page

Flow

  1. develop ๋ธŒ๋žœ์น˜์—์„œ feature ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ.
  2. ์ž‘์—…์„ ์™„๋ฃŒํ•˜๊ณ  ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€์— ๋งž๊ฒŒ ์ปค๋ฐ‹.
  3. Pull Request๋ฅผ ์ƒ์„ฑ / ํŒ€์›๋“ค์˜ ๋ฆฌ๋ทฐ.
  4. ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ ํ›„ develop ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉ.
  5. ๋ฐฐํฌ ์‹œ์ ์— develop ๋ธŒ๋žœ์น˜๋ฅผ main ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉ.
  6. main ๋ธŒ๋žœ์น˜ ๋ฐฐํฌ

์˜ˆ์‹œ:

# ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout -b feature/๊ธฐ๋Šฅ๋ช…

# ์ž‘์—… ํ›„ ์ปค๋ฐ‹ & ์›๊ฒฉ ์ €์žฅ์†Œ์— ํ‘ธ์‹œ
git add .
git commit -m "โœจ Feat: ๊ธฐ๋Šฅ ์„ค๋ช…"
git push origin feature/๊ธฐ๋Šฅ๋ช…

# โžก๏ธ GitHub์—์„œ PR(Pull Request) ์ƒ์„ฑ
#    base: develop โ† compare: feature/๊ธฐ๋Šฅ๋ช…
#    ํŒ€์›๋“ค๊ณผ ์ฝ”๋“œ ๋ฆฌ๋ทฐ ํ›„ develop ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉ