Skip to content
ink-0 edited this page Jun 28, 2021 · 6 revisions

๐Ÿ“Œ ์ •๊ธฐ ๋ฏธํŒ… ์ •์ฑ…

  • ๋งค์ผ PM 3:00 Zoom ์ •๊ธฐ ๋ฏธํŒ…!

    • FE, iOS ๊ธฐ๋Šฅ ๊ตฌํ˜„ ๋‹จ๊ณ„ ์‹œ์—ฐ
    • BE API ์š”์ฒญ์‚ฌํ•ญ ํ˜‘์˜
    • Slack ์—์„œ ํ•  ์ด์•ผ๊ธฐ ์—†์„ ๊ฒƒ ๊ฐ™์œผ๋ฉด, ์Šคํ‚ต์‹ ์ฒญ ๊ฐ€๋Šฅ!
  • ๋งค์ผ AM 10:00 ์Šคํฌ๋Ÿผ

    • ์žก๋‹ด์œผ๋กœ ์ž  ๊นจ์šฐ๊ธฐ
    • ํ•˜๋ฃจ ์˜ˆ์ƒ ์ผ๊ณผ

๐Ÿ“Œ Branch Rule

rule

  • ios backend frontend ๋ธŒ๋žœ์น˜์— ๊ฐ๊ฐ ๊ฐœ๋ฐœ
  • ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ์ „ ๊ด€๋ จ ์ด์Šˆ ๋งŒ๋“ค๊ธฐ
  • PR์€ ๊ฐ ๋ธŒ๋žœ์น˜๋กœ ๋ณด๋‚ธ๋‹ค

example

{์ง๊ตฐ} / {๊ธฐ๋Šฅ} / #{์ด์Šˆ๋ฒˆํ˜ธ} / {๋ธŒ๋žœ์น˜์ œ๋ชฉ} 
ex) frontend : FE/feature/#24/LoginUI

๋ธŒ๋žœ์น˜ ์˜ˆ์ƒ ์‹œ๋‚˜๋ฆฌ์˜ค

  1. ๊ฐ ์ง๊ตฐ๋ณ„ ์ด์Šˆ์™€ ๋ธŒ๋žœ์น˜ ์ž์œ ๋กญ๊ฒŒ ์ƒ์„ฑ
  2. ์ฝ”๋“œ ๋ฆฌ๋ทฐ ์‹œ main ๋ธŒ๋žœ์น˜์— PR ์ „์†ก
  3. ์ฝ”๋“œ ๋ฆฌ๋ทฐ ์ ์šฉ ํ›„ main ๋ธŒ๋žœ์น˜์— merge

๐Ÿ“ŒCommit Convention

Basic Rule

  • ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋Š” ์•Œ์•„๋ณด๊ธฐ ์‰ฝ๊ฒŒ ํ•œ๊ธ€๋กœ ์ž‘์„ฑ.
  • ๋‹ค๋งŒ, Commit Header๋Š” ์˜์–ด๋กœ ์ž‘์„ฑ.

Convention

{ํ—ค๋”}: {์ปค๋ฐ‹ ํƒ€์ดํ‹€}
ghojeong/issue-tracker/#{issue_number}
ex) feat:๋กœ๊ทธ์ธ UI ๊ตฌ์„ฑ
ghojeong/issue-tracker/#24

Commit Header

  • feat: ์‹ ๊ทœ ๊ธฐ๋Šฅ ๊ตฌํ˜„ : ์‚ฌ์šฉ์ž๋ฅผ ์œ„ํ•œ ์‹  ๊ธฐ๋Šฅ; ์ƒˆ๋กœ์šด ๋นŒ๋“œ ๊ด€๋ จ ๊ธฐ๋Šฅ์€ ๋ฏธํฌํ•จ
  • fix: ๋ฒ„๊ทธ๋‚˜ ์—๋Ÿฌ ์ˆ˜์ • : ์‚ฌ์šฉ์ž ๋ฒ„๊ทธ ์ˆ˜์ •; ๋นŒ๋“œ ๊ด€๋ จ ๋ฒ„๊ทธ ํ”ฝ์Šค ๋ฏธํฌํ•จ
  • refactor: ๋ฆฌํŒฉํ† ๋ง : Production Code ( ๋น„์ฆˆ๋‹ˆ์Šค ๋กœ์ง ?)์˜ ์ˆ˜์ •์‚ฌํ•ญ; ๋ณ€์ˆ˜์˜ ์ด๋ฆ„ ๋ณ€๊ฒฝ ํฌํ•จ.
  • style: ์ฝ”๋“œ ์Šคํƒ€์ผ ์ˆ˜์ • : ํฌ๋ฉง, ์žŠ์–ด๋ฒ„๋ฆฐ ์„ธ๋ฏธ ์ฝœ๋ก  ๋“ฑ; Production Code์˜ ์ฝ”๋“œ ๋ณ€๊ฒฝ์ด ์—†์Œ.
  • docs: ๋ฌธ์„œ ์ž‘์—… : ๋ฌธ์„œ์˜ ๋ณ€๊ฒฝ์ 
  • test: ํ…Œ์ŠคํŠธ ์ฝ”๋“œ : ๋น ์ง„ ํ…Œ์ŠคํŠธ์˜ ์ถ”๊ฐ€, ํ…Œ์ŠคํŠธ์˜ ๋ฆฌํŒฉํ„ฐ๋ง; Production Code์˜ ๋ณ€๊ฒฝ ์—†์Œ
  • chore: ๊ทธ์™ธ ๊ธฐํƒ€ : updating grunt tasks etc; Production Code์˜ ๋ณ€๊ฒฝ ์—†์Œ

์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ์ž์ฃผ ์“ฐ๋Š” ๋™์‚ฌ

  • ์ถ”๊ฐ€(Add)
  • ์ˆ˜์ •(Update)
  • ์‚ญ์ œ(Delete)

์˜ˆ์‹œ

  • refactor: Delete plus function from practice/prac03/index.js (#11)
  • style: Add practice/background.js (#13)
  • fix: Add meta property to index.html (#22)
  • docs: Update README.md (#27)
  • feat: Connect weather API (#31)

์ฐธ๊ณ  ๋งํฌ