Skip to content

๐Ÿšฆ ์ž‘์—… ์œ ์˜์‚ฌํ•ญ

JongHyun edited this page Oct 13, 2024 · 16 revisions

๐ŸŒŸ ๋ธŒ๋žœ์น˜ ์ตœ์‹ ํ™” ๋ฐ ๋ณ‘ํ•ฉ Flow

์ˆ˜๋™ Sync ํ™˜๊ฒฝ ์„ธํŒ…

  1. ์•„๋ž˜ ๋ช…๋ น์–ด๋กœ upstream ์ฃผ์†Œ ์กด์žฌ ์œ ๋ฌด๋ฅผ ํ™•์ธํ•ฉ๋‹ˆ๋‹ค.
git remote -v
  1. ์•„๋ž˜ ๋ช…๋ น์–ด๋กœ upstream ์ฃผ์†Œ๋ฅผ ์›๊ฒฉ์œผ๋กœ ๋“ฑ๋กํ•ฉ๋‹ˆ๋‹ค.
git remote add upstream [REPO ์ฃผ์†Œ]
  1. git remote -v ๋ช…๋ น์–ด๋กœ ๋‹ค์‹œ ํ™•์ธํ•˜๋ฉด ๋‹ค์Œ์ฒ˜๋Ÿผ ์„ธํŒ…๋˜์–ด์žˆ์Šต๋‹ˆ๋‹ค.

image


๋ธŒ๋žœ์น˜ ์ตœ์‹ ํ™”

์ด ๋ถ€๋ถ„์€ develop ๋ธŒ๋žœ์น˜ ์—…๋ฐ์ดํŠธ ๋  ๋•Œ๋งˆ๋‹ค ์ž‘์—… ์ค‘์ด์‹  ๋ธŒ๋žœ์น˜์— ๊ทธ๋•Œ๊ทธ๋•Œ ๋ฐ˜์˜ํ•ด์ฃผ์„ธ์š”!

  1. ๋จผ์ € Forkํ•œ Repository์— ๋‹ค์Œ ๋ช…๋ น์–ด๋กœ develop ๋ธŒ๋žœ์น˜๋ฅผ ๋งŒ๋“ญ๋‹ˆ๋‹ค.
git checkout -b develop
  1. ํ•ด๋‹น ๋ธŒ๋žœ์น˜์—์„œ ๋‹ค์Œ ๋ช…๋ น์–ด๋ฅผ ํ†ตํ•ด ์ตœ์‹  commit์„ ์—…๋ฐ์ดํŠธํ•ฉ๋‹ˆ๋‹ค.
git pull upstream develop

๋ณ‘ํ•ฉ ์ง„ํ–‰

  1. ๋‹ค์Œ ๋ช…๋ น์–ด๋กœ ์›๋ž˜ ์ž‘์—…ํ•˜๋˜ ๋ธŒ๋žœ์น˜๋กœ ๋Œ์•„๊ฐ‘๋‹ˆ๋‹ค.
git checkout {์ž‘์—… ๋ธŒ๋žœ์น˜๋ช…}
  1. ์ตœ์‹ ํ™” ๋œ develop ๋ธŒ๋žœ์น˜์™€ ๋ณ‘ํ•ฉ์„ ์ง„ํ–‰ํ•ฉ๋‹ˆ๋‹ค.
git merge develop

์ถฉ๋Œ ์ฝ”๋“œ ํ•ด๊ฒฐ & commit๋ช… ์ž‘์„ฑ

  1. ์ถฉ๋Œ ์ฝ”๋“œ๋ฅผ ํ•ด๊ฒฐํ•œ ํ›„ commit๋ช…์„ ๋‹ค์Œ๊ณผ ๊ฐ™์ด ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.
Merge branch 'develop' into {์ž‘์—… ๋ธŒ๋žœ์น˜๋ช…} with conflict resolution
  1. PR์— ๋ณ‘ํ•ฉ commit ์˜ฌ๋ฆฝ๋‹ˆ๋‹ค.
git push origin {์ž‘์—… ๋ธŒ๋žœ์น˜๋ช…}

๐ŸŒŸ Commit & PR ์ž‘์—… Flow

์ž‘์—…ํ•œ ์ฝ”๋“œ commit ํ•˜๊ธฐ

  1. ๋งˆ์ง€๋ง‰ commit๋ช…์—๋งŒ ๋‹ค์Œ๊ณผ ๊ฐ™์ด close #{์ด์Šˆ๋ฒˆํ˜ธ}๋ฅผ ์ถ”๊ฐ€ํ•ด๋„ ๋ฉ๋‹ˆ๋‹ค.
feat(FE): ์‚ฌ์šฉ์ž ํ”„๋กœํ•„ ํŽ˜์ด์ง€ ์ถ”๊ฐ€

- ์‚ฌ์šฉ์ž ์ •๋ณด ํ‘œ์‹œ
- ํ”„๋กœํ•„ ์‚ฌ์ง„ ์—…๋กœ๋“œ ๊ธฐ๋Šฅ ๊ตฌํ˜„

close #123

PR ๋“ฑ๋ก

  1. ๋ณธ์ธ Fork Repository์˜ ์ž‘์—… ๋ธŒ๋žœ์น˜๋ช… โ†’ ์›๋ณธ Repository์˜ develop ๋ธŒ๋žœ์น˜๋ฅผ ํ–ฅํ•˜๋„๋ก ํ•ฉ๋‹ˆ๋‹ค.

image

  1. PR ์ปจ๋ฒค์…˜์„ ์ง€์ผœ์„œ Title, Description์„ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.

  2. ์˜ค๋ฅธ์ชฝ Reviewers(๋ฆฌ๋ทฐํ•ด์ค„ ์‚ฌ๋žŒ), Assignees(๋‚ด ๊ณ„์ •), Labels(์ž‘์—… ํƒœ๊ทธ)๋ฅผ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค.

  3. Projects, Milestone, Development์„ค์ • ๊ด€๋ จ ์•Œ์•„์•ผ ํ•  ์ 

    • ์ด์Šˆ ํ•˜๋‚˜๋ฅผ ์—ฌ๋Ÿฌ PR๋กœ ์ž‘์—…ํ•  ์ˆ˜ ์žˆ์Œ

      • ๋งŒ์•ฝ ์ด์Šˆ ํ•˜๋‚˜๋ฅผ ๋‚˜๋ˆ„์–ด ๊ฐœ๋ฐœํ•œ๋‹ค๋ฉด ํ•ด๋‹น Projects, Milestone, Development ์„ค์ •

      • ๋งŒ์•ฝ ์ด์Šˆ ํ•˜๋‚˜๋ฅผ PR ํ•˜๋‚˜๋กœ ๋๋‚ธ๋‹ค๋ฉด ํ•ด๋‹น Projects, Milestone, Development ์„ค์ • ์•ˆํ•ด๋„ ๋จ (Issue์™€ ์ค‘๋ณต ๊ธฐ๋ก ๋จ)


์ด์Šˆ์™€ PR ์‹ฑํฌ ๋งž์ถ”๊ธฐ

  1. ๋‹ค์Œ๊ณผ ๊ฐ™์ด Development๋Š” ํ•ด๋‹น PR์— ํ•ด๋‹นํ•˜๋Š” ์ด์Šˆ๋ฅผ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. (PR ์˜ฌ๋ฆฐ ๋ธŒ๋žœ์น˜๊ฐ€ ๋ณ‘ํ•ฉ๋˜๋ฉด ๋‹ซํž ์ด์Šˆ๋ฅผ ์ž‘์„ฑ)

    image

    ๋งŒ์•ฝ Development ์„ค์ •์— ์•„๋ฌด๊ฒƒ๋„ ์•ˆ๋œจ๋ฉด ํ•ด๋‹น ์ด์Šˆ์˜ Development์— ๊ฐ€์„œ PR๊ณผ ์‹ฑํฌ๋ฅผ ๋งž์ถฐ์ค๋‹ˆ๋‹ค.


์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฐ ๋ณ‘ํ•ฉ

  1. ์ฝ”๋“œ ๋ฆฌ๋ทฐ๋ฅผ ์ง„ํ–‰ํ•˜๊ณ  ๋ชจ๋“  ๋ฆฌ๋ทฐ๋ฅผ Resolveํ•œ ํ›„ approve ํ•ฉ๋‹ˆ๋‹ค.

  2. ๋ณ‘ํ•ฉ์€ ๋ฐ˜๋“œ์‹œ Squash & Merge๋กœ ์ง„ํ–‰ํ•ฉ๋‹ˆ๋‹ค.