Skip to content

Latest commit

ย 

History

History
122 lines (88 loc) ยท 2.95 KB

File metadata and controls

122 lines (88 loc) ยท 2.95 KB

haenaem

A new Flutter project.

Getting Started

This project is a starting point for a Flutter application.

A few resources to get you started if this is your first Flutter project:

For help getting started with Flutter development, view the online documentation, which offers tutorials, samples, guidance on mobile development, and a full API reference.

FrontEnd

ํ•ด๋ƒ„ ํ”„๋ก ํŠธ์—”๋“œ ๋ ˆํฌ์ง€ํ† ๋ฆฌ


Commit Convention

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋Š” ์•„๋ž˜์™€ ๊ฐ™์€ ํ˜•์‹์œผ๋กœ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค:

์ปค๋ฐ‹ ํƒ€์ž…

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

์˜ˆ์‹œ

feat: ๋ฌดํ•œ ์Šคํฌ๋กค ํŽ˜์ด์ง• ๊ธฐ๋Šฅ ์ถ”๊ฐ€
fix: ๊ฒŒ์‹œ๋ฌผ ๋กœ๋”ฉ ์ค‘ ์ค‘๋ณต ํ˜ธ์ถœ๋˜๋Š” ๋ฒ„๊ทธ ์ˆ˜์ •
docs: README์— Git Flow ์ „๋žต ์ถ”๊ฐ€
refactor: WriteViewModel ์ฝ”๋“œ ์ตœ์ ํ™”

๐ŸŒณ Git Flow

ํ”„๋กœ์ ํŠธ์—์„œ๋Š” ์•„๋ž˜ ๋ธŒ๋žœ์น˜ ์ „๋žต์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

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

  • main: ์‹ค์ œ ๋ฐฐํฌ ๋ฒ„์ „
  • develop: ๋‹ค์Œ ๋ฐฐํฌ๋ฅผ ์ค€๋น„ํ•˜๋Š” ํ†ตํ•ฉ ๋ธŒ๋žœ์น˜
  • feature/: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
  • release/: ๋ฐฐํฌ ์ค€๋น„ ๋ธŒ๋žœ์น˜
  • hotfix/: ์šด์˜ ์ค‘ ๊ธด๊ธ‰ ์ˆ˜์ • ๋ธŒ๋žœ์น˜

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

1. ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ

# develop ๋ธŒ๋žœ์น˜ ์ตœ์‹ ํ™”
git checkout develop
git pull origin develop

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

# ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ํ›„ ์ปค๋ฐ‹
git add .
git commit -m "feat: ๊ธ€ ์ž‘์„ฑ API ์—ฐ๋™"
git push origin feature/๋ธŒ๋žœ์น˜๋ช…

โ†’ ๊ธฐ๋Šฅ ๊ฐœ๋ฐœ ํ›„ PR ์ƒ์„ฑ โ†’ ์ฝ”๋“œ ๋ฆฌ๋ทฐ โ†’ ๋ฆฌ๋ทฐ ์™„๋ฃŒ ํ›„ Merge (ํ•„์š” ์‹œ ๋ฐ”๋กœ Merge)

2. Merge ํ›„ develop ์ตœ์‹ ํ™”

# develop ๋ธŒ๋žœ์น˜ ์ตœ์‹ ํ™”
git checkout develop
git pull origin develop

3. Release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ๋ฐ ๋ฐฐํฌ ์ค€๋น„

# develop ๋ธŒ๋žœ์น˜์—์„œ release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ
git checkout develop
git checkout -b release/v1.0.0

# ๋ฒ„์ „ ์—…๋ฐ์ดํŠธ, ๋นŒ๋“œ ํ…Œ์ŠคํŠธ, ๋ฒ„๊ทธ ์ˆ˜์ •
git commit -am "chore: release ์ค€๋น„ v1.0.0"

# release ๋ธŒ๋žœ์น˜ push
git push origin release/v1.0.0

โ†’ PR๋กœ release โ†’ main ๋ณ‘ํ•ฉ โ†’ ๋ฐฐํฌ ์™„๋ฃŒ ํ›„ release โ†’ develop ๋ณ‘ํ•ฉ

4. Hotfix (๊ธด๊ธ‰ ๋ฒ„๊ทธ ์ˆ˜์ •)

git checkout main
git pull origin main
git checkout -b hotfix/๋ฒ„๊ทธ์ˆ˜์ •

# ๋ฒ„๊ทธ ์ˆ˜์ • ํ›„ ์ปค๋ฐ‹
git commit -am "fix: ๊ธด๊ธ‰ ๋ฒ„๊ทธ ์ˆ˜์ •"
git push origin hotfix/๋ฒ„๊ทธ์ˆ˜์ •

โ†’ PR๋กœ main โ†’ merge ๋ณ‘ํ•ฉ โ†’ ๋ฐฐํฌ ์™„๋ฃŒ ํ›„ release โ†’ develop ๋ณ‘ํ•ฉ


๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ ๊ทœ์น™

  • feature/๊ธฐ๋Šฅ๋ช…
  • fix/๋ฒ„๊ทธ๋ช…
  • release/๋ฒ„์ „
  • hotfix/๋ฒ„๊ทธ๋ช