Skip to content

๐Ÿ›ฉ๏ธ 01_ํ˜‘์—…๋ฐฉ์‹

kimyo edited this page Jul 6, 2022 · 19 revisions

๐Ÿ”ธ ๊นƒํ—™ ํ”„๋กœ์ ํŠธ

๐Ÿ”ธ issue ๊ด€๋ฆฌ

ํ”„๋กœ๋•ํŠธ ๋ฐฑ๋กœ๊ทธ๋ฅผ issue๋กœ ๋“ฑ๋กํ•ฉ๋‹ˆ๋‹ค ํ”„๋กœ๋•ํŠธ ๋ฐฑ๋กœ๊ทธ์— ๋Œ€ํ•œ ์„ธ๋ถ€ ํ…Œ์Šคํฌ๋“ค์„ ์ž‘์„ฑํ•˜๊ณ , ๋‚ด๋ถ€์—์„œ ์ด์Šˆ๋กœ ๋‹ค์‹œ ๋“ฑ๋กํ•ฉ๋‹ˆ๋‹ค.
์ด์Šˆ๋กœ ๋“ฑ๋ก๋œ ์‚ฌํ•ญ์„ ํ™•์ธํ•˜๊ณ , ์ด์Šˆ๋ฅผ ๊ธฐ๋ฐ˜์œผ๋กœ develop์œผ๋กœ ๋ถ€ํ„ฐ ๊ด€๋ จ ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•ด ์ž‘์—…์„ ์‹œ์ž‘ํ•ฉ๋‹ˆ๋‹ค.
์„ธ๋ถ€ ํ…Œ์Šคํฌ๋“ค์„ ๋ชจ๋‘ ์™„๋ฃŒํ•œ ํ”„๋กœ๋•ํŠธ ๋ฐฑ๋กœ๊ทธ๋Š” ์™„๋ฃŒ์ƒํƒœ๋กœ ๋ณ€๊ฒฝ ํ›„ close ํ•ฉ๋‹ˆ๋‹ค

  • ์ด์Šˆ์—๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์€ ์‚ฌํ•ญ์„ ์ง€์ •ํ•ด ์ค๋‹ˆ๋‹ค.
- ์ด์Šˆ์— ๋Œ€ํ•œ ํ˜„์žฌ ์ƒํƒœ (ex - in progress)
- ๋‹ด๋‹น์ž ์„ค์ • - ๋ณธ์ธ assign

๐Ÿ”ธ branch ๊ด€๋ฆฌ

  • Remote(prgrms-be-devcourse / BEDV2_Amabnb)

    • main/develop
  • Fork (Local) || Remote (์™„๋ฃŒ์‹œ ์‚ญ์ œ)

    • feature/{issue-num}-{๊ธฐ๋Šฅ๋ช…}

๐Ÿ”ธ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ๊ด€๋ฆฌ

  • feature branch ์—์„œ๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์ด ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ๊ด€๋ฆฌํ•ฉ๋‹ˆ๋‹ค.
    ๋ณธ์ธ๊ณผ ํŒ€์› ๋ชจ๋‘ ์ž‘์—…๋‚ด์šฉ์˜ ๋ณ€๊ฒฝ์ ์„ ํ™•์ธํ•˜๊ณ  ๊ด€๋ฆฌํ•˜๊ธฐ ์‰ฌ์›Œ์ง‘๋‹ˆ๋‹ค.
feat: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€
fix: ๋ฒ„๊ทธ ์ˆ˜์ •
docs: ๋ฌธ์„œ ์ˆ˜์ •
style: ์ฝ”๋“œ ํฌ๋งทํŒ…, ์„ธ๋ฏธ์ฝœ๋ก  ๋ˆ„๋ฝ, ์ฝ”๋“œ ๋ณ€๊ฒฝ์ด ์—†๋Š” ๊ฒฝ์šฐ
refac: ์ฝ”๋“œ ๋ฆฌํŽ™ํ† ๋ง
test: ํ…Œ์ŠคํŠธ ์ฝ”๋“œ, ๋ฆฌํŽ™ํ† ๋ง ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ถ”๊ฐ€
chore: ๋นŒ๋“œ ์—…๋ฌด ์ˆ˜์ •, ํŒจํ‚ค์ง€ ๋งค๋‹ˆ์ € ์ˆ˜์ •
  • develop branch ์—์„œ๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์ด ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ๊ด€๋ฆฌํ•ฉ๋‹ˆ๋‹ค.
    [#{issue-number}] {issue-title} (#{pr-number})

๐Ÿ”ธ PR ๊ด€๋ฆฌ

  • PR์‹œ์—๋Š” ํ•ด๊ฒฐํ•œ issue ๋ฒˆํ˜ธ์™€ ์ฃผ์ œ๋ฅผ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.
    ex) [#31] feat: xxx์—์„œ yyy๋ฅผ ํ•ด์•ผํ•œ๋‹ค

  • PR ๋ณธ๋ฌธ์— ํ•ด๊ฒฐํ•œ ์ด์Šˆ๋ฅผ ์—ฐ๋™ํ•ฉ๋‹ˆ๋‹ค.
    resolves #31 ๊ณผ ๊ฐ™์ด ํ•ด๊ฒฐํ•œ ์ด์Šˆ๋ฒˆํ˜ธ๋ฅผ ํฌํ•จํ•˜์—ฌ PR์ด ๋จธ์ง€๋จ์— ๋”ฐ๋ผ ์ž๋™์œผ๋กœ ํ•ด๊ฒฐํ•œ ์ด์Šˆ๋ฅผ close ํ•ฉ๋‹ˆ๋‹ค.

  • PR์€ squash merge ๋งŒ ํ—ˆ์šฉํ•˜๋„๋ก ์„ค์ •๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค.
    ์ž‘์—…ํ•œ ์ปค๋ฐ‹๋‚ด์—ญ๋“ค์€ squash merge ๋ฅผ ํ†ตํ•ด merge ๋ฉ๋‹ˆ๋‹ค.
    ์ด๋•Œ ์ž๋™์œผ๋กœ PR ๋„ค์ด๋ฐ์— ๋”ฐ๋ผ PR๋„˜๋ฒ„๋ฅผ ํฌํ•จํ•œ develop ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๊ฐ€ ์ž๋™์œผ๋กœ ์ž…๋ ฅ๋ฉ๋‹ˆ๋‹ค.
    ex) [#31] feat: xxx์—์„œ yyy๋ฅผ ํ•ด์•ผํ•œ๋‹ค (#51)

๐Ÿ”ธ ์ฝ”๋“œ๋ฆฌ๋ทฐ

  • PR์ด ์˜ฌ๋ผ์˜ค๋ฉด, ๋ฆฌ๋ทฐ์–ด๋ฅผ ํ• ๋‹นํ•˜๊ณ  ํ•œ๋ช… ์ด์ƒ์˜ approve ๊ฐ€ ์žˆ์–ด์•ผ mergeํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
  • PR์„ ์˜ฌ๋ฆฐ ๋‹ด๋‹น์ž๊ฐ€ ๋ฆฌ๋ทฐ๋ฅผ ํ†ตํ•ด ์ˆ˜์ •์„ ๋งˆ์ณค์„ ๋•Œ merge ํ•ฉ๋‹ˆ๋‹ค.