Skip to content

Latest commit

ย 

History

History
38 lines (25 loc) ยท 1.02 KB

record_day2.md

File metadata and controls

38 lines (25 loc) ยท 1.02 KB

Contributhon 2ํšŒ์ฐจ(8/27) ์ •๋ฆฌ

rebase

git remote add origin [URL] // git remote add upstream [์›๋ณธURL]

  • github ์›๋ณธ ๋ฆฌํฌ์ง€ํ† ๋ฆฌ ๋“ฑ๋ก

git fetch upstream master

  • .git ํŒŒ์ผ์— ๋‚ด๋ถ€์ ์œผ๋กœ ๊ฐ€์ง€๊ณ  ์žˆ์Œ

git rebase upstream/master

  • rebase ์ง„์ž…

์ˆ˜์ • ํ›„ git add

git rebase --continue

  • rebase ์™„๋ฃŒ

์›๋ณธ ๋ฆฌํฌ์ง€ํ† ๋ฆฌ์— ํฌํฌ๋ฐ›์€ ์ดํ›„์— ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์ƒ๊ฒผ์„ ๊ฒฝ์šฐ

  • remote๋กœ add๋กœ ์›๋ณธ๋ฆฌํฌ URL ์ถ”๊ฐ€
  • fetch๋กœ ์›๋ณธ๋ฆฌํฌ์ง€ํ† ๋ฆฌ ๋ณ€๊ฒฝ์‚ฌํ•ญ ์ ์žฌ
  • rebase๋กœ

rebase์‹œ conflict <- ๊ฐ™์€ ํŒŒ์ผ๋‚ด์— ์ˆ˜์ •์ด ์ด๋ค„์ง„ ๊ฒฝ์šฐ

record ๊ณผ์ •

[1]

[2] - line by line

๋‹ค์Œ schedule / contribute ํ•  ์ˆ˜ ์žˆ๋Š” ๊ฒƒ ์ƒ๊ฐ

  • info dump ๋“ฑ์˜ ๋ช…๋ น

  • documentation ์— ๋น ์ ธ์žˆ๋Š”๊ฒƒ(option ์„ค๋ช…์ด ์—†๋Š” ๊ฒƒ)

  • example ๊ฐ™์€๊ฑฐ

  • ๋‚ด๊ฐ€ ์ฐพ์•„๋‚˜๊ฐ€๋Š” ๊ณผ์ •!