Skip to content

Latest commit

ย 

History

History
47 lines (38 loc) ยท 2.03 KB

File metadata and controls

47 lines (38 loc) ยท 2.03 KB

Open S/W Exploring Camp

Project

Team8 Member

  • MinKuk Jo
  • Donghoon Song
  • YEONJE CHOI
  • Sanggoo Kim

8. ํ’€๋ฆฌํ€˜์ŠคํŠธ ํ•ด๋ณด๊ธฐ

  • Pull request
  • git remote add upstream git@github.com:openstack-kr/contributhon-2018-knu.git ์ž…๋ ฅ
  • ์ด ๋•Œ ๋ช…๋ น์–ด๋Š” 72์ž ๋‹จ์œ„๋กœ ๊ฐœํ–‰ํ•ด์•ผ ํ•œ๋‹ค.
  • git pull upstream master ์ž…๋ ฅํ•˜์—ฌ, ์˜จ๋ผ์ธ์— ์žˆ๋Š” ๋ณ€๊ฒฝ ์‚ฌํ•ญ์„ ๋กœ์ปฌ๋กœ ๋‹ค์šด๋กœ๋“œํ•ด์•ผ ํ•˜๋Š”๋ฐ, ๋กœ์ปฌ ์ €์žฅ์†Œ์— ์›๊ฒฉ ์ €์žฅ์†Œ๋ฅผ ์ถ”๊ฐ€ํ•ด์•ผํ•œ๋‹ค
  • ๊ทธ ๋‹ค์Œ์œผ๋กœ ls ์ž…๋ ฅํ•˜์—ฌ README.rst ์žˆ๋Š”์ง€ ํ™•์ธํ•จ. ์กด์žฌํ•œ๋‹ค๋ฉด ์ œ๋Œ€๋กœ ๋‹ค์šด๋กœ๋“œ ๋œ ๊ฒƒ
  • ๋งŒ์•ฝ ์กด์žฌํ•˜์ง€ ์•Š๋Š” ๋‹ค๋ฉด, ์ž…๋ ฅ ๋˜์—ˆ๋˜ ๋ช…๋ น์–ด๋“ค์„ ์ œ๊ฑฐ(git remote rm)ํ•œ๋‹ค์Œ ์ฒ˜์Œ๋ถ€ํ„ฐ ๋‹ค์‹œ ์‹คํ–‰ํ•  ๊ฒƒ.
  • ์ œ๋Œ€๋กœ ๋‹ค์šด๋กœ๋“œ ๋˜์—ˆ๋‹ค๋ฉด, nano README.rst ์ž…๋ ฅํ•œ ๋’ค, ๋‚ด ์ด๋ฆ„์„ README.rst์— ์ถ”๊ฐ€ ํ›„ ์ €์žฅ (ctrl + o -> enter -> ctrl + x )
  • git commit -a ํ›„ ์ด๋ฒˆ ์ปค๋ฐ‹(๋ณ€๊ฒฝ) ์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ์ž…๋ ฅ
    : ๋ณ€๊ฒฝํ•œ ๋‚ด์šฉ์— ๋Œ€ํ•ด commit์„ ์ถ”๊ฐ€ํ•˜์—ฌ์„œ ์–ด๋–ค ๋‚ด์šฉ์ด ๋ฐ”๋€Œ ์—ˆ๋Š”์ง€์— ๋Œ€ํ•ด ์•Œ๋ ค์ค๋‹ˆ๋‹ค.
  • git push origin master ์ž…๋ ฅํ•˜์—ฌ ๋‚ด ์˜จ๋ผ์ธ ์ €์žฅ์†Œ์— ๋ณ€๊ฒฝ ์‚ฌํ•ญ์„
    ์—…๋กœ๋“œ
    : local์˜ ๋ธŒ๋ Œ์น˜์—์„œ ์„œ๋ฒ„์˜ master ๋กœ ์ •๋ณด๋ฅผ ์ด๋™ํ•ฉ๋‹ˆ๋‹ค.
  • ํŒŒ์ด์–ดํญ์Šค๋กœ github ํ™ˆํŽ˜์ด์ง€ ๋“ค์–ด๊ฐ€ ๋‚ด ์ €์žฅ์†Œ (https://github.com/๋‚ด ID/contributhon-2018-knu) ๋“ค์–ด๊ฐ€ New Pull request ํด๋ฆญ
  • ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ์„ค๋ช…์œผ๋กœ ์ž…๋ ฅํ•œ ํ›„, pull request

16. ๋‹ค๋ฅธ ํŒ€์› ํ‰๊ฐ€ํ•ด๋ณด๊ธฐ

  • My -> Changes -> ์ž๊ธฐ ๋ฌธ์„œ -> URL ํ™•์ธ -> ๋‹ค๋ฅธ ์‚ฌ๋žŒ๋“ค์ด ์ ‘๊ทผํ•ด์„œ ๋ฆฌ๋ทฐ๊ฐ€๋Šฅ
  • Reply -> ๋ฆฌ๋ทฐ๊ฐ€๋Šฅ
  • Code-review :
  • -2 : ๋ชป ์“ฐ๋Š” ์ฝ”๋“œ (Do not merge)
  • -1 : ์ˆ˜์ •์ด ํ•„์š”ํ•จ (This patch needs further work before it can be merged)
  • +1 : ์ž˜ํ•œ ์ฝ”๋“œ (Looks good to me, but someone else must approve)
  • +2 : ์ฝ”์–ด ์ฝ”๋“œ (Looks good to me (core reviewer))
  • Commit message : Commit message๋“ค์„ ๋ณผ ์ˆ˜ ์žˆ์Œ, ํ•„์š”ํ•˜๋ฉด Edit๋„ ๊ฐ€๋Šฅ