Skip to content

Latest commit

ย 

History

History
41 lines (33 loc) ยท 2.87 KB

keeping-your-fork-synced-with-this-repository.ko.md

File metadata and controls

41 lines (33 loc) ยท 2.87 KB

์—ฌ๋Ÿฌ๋ถ„์ด ํฌํฌํ•œ ์ €์žฅ์†Œ์™€ ์‹ฑํฌ์ƒํƒœ ์œ ์ง€ํ•˜๊ธฐ

๋จผ์ €, ์ „์ฒด ์‹ฑํฌ๊ณผ์ •์„ ์ดํ•ดํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค. ๋ณธ ์Šคํ‚ค๋งˆ์—๋Š” 3๊ฐœ์˜ ์ €์žฅ์†Œ๋“ค์ด ์žˆ์Šต๋‹ˆ๋‹ค. ์ €์˜ GitHub์— ์žˆ๋Š” ์ œ ๊ณต๊ฐœ์ €์žฅ์†Œ์ธ github.com/Roshanjossey/first-contributions/์™€ ์—ฌ๋Ÿฌ๋ถ„์˜ ํฌํฌ๋œ ์ €์žฅ์†Œ์ธ github.com/Your-Name/first-contributions/, ๊ทธ๋ฆฌ๊ณ  ๋กœ์ปฌ ๋จธ์‹ ์— ์œ„์น˜ํ•ด์„œ ํ˜„์žฌ ์ž‘์—…์ค‘์ธ ์ €์žฅ์†Œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค. ์˜คํ”ˆ ์†Œ์Šค ํ”„๋กœ์ ํŠธ์— ํŠนํ™”๋œ ์ด๋Ÿฌํ•œ ์กฐํ•ฉ์„ ํŠธ๋ผ์ด์•ต๊ธ€ ์›Œํฌํ”Œ๋กœ์šฐ๋ผ๊ณ  ๋ถ€๋ฆ…๋‹ˆ๋‹ค.

triangle workflow

์—ฌ๋Ÿฌ๋ถ„์˜ ๋‘ ๊ฐœ์˜ ์ €์žฅ์†Œ๋“ค์„ ์ œ ๊ณต๊ฐœ ์ €์žฅ์†Œ์˜ ์ตœ์‹  ์ƒํƒœ์™€ ์‹ฑํฌ์ƒํƒœ๋ฅผ ์œ ์ง€ํ•˜๊ธฐ ์œ„ํ•ด์„œ๋Š” ์ œ์ผ ๋จผ์ €์—ฌ๋Ÿฌ๋ถ„์˜ ๋กœ์ปฌ๋จธ์‹ ์— ์œ„์น˜ํ•œ ์ €์žฅ์†Œ๋ฅผ ์ œ ๊ณต๊ฐœ ์ €์žฅ์†Œ์™€ fetch์™€ merge๋ฅผ ํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค. ๋‘๋ฒˆ์งธ๋Š” ์—ฌ๋Ÿฌ๋ถ„์˜ ๋กœ์ปฌ ์ €์žฅ์†Œ๋ฅผ ํฌํฌ๋œ GitHub์˜ ์ €์žฅ์†Œ์— pushํ•˜๋Š” ๊ฒƒ ์ž…๋‹ˆ๋‹ค. ์ด์ „ ๊ณผ์ •์—์„œ ๋ดค๋“ฏ์ด "pull request"๋ฅผ ์š”์ฒญํ•  ์ˆ˜ ์žˆ๋Š” ๊ณณ์€ ์˜ค์ง ํฌํฌ๋œ ์ €์žฅ์†Œ์—์„œ๋งŒ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค. ๋”ฐ๋ผ์„œ ๋งˆ์ง€๋ง‰์œผ๋กœ ์—…๋ฐ์ดํŠธ ๋˜์–ด์•ผํ•˜๋Š” ์ €์žฅ์†Œ๋Š” ํฌํฌ๋œ GitHub์ž…๋‹ˆ๋‹ค. ์ž, ์–ด๋–ป๊ฒŒํ•˜๋Š”์ง€ ๋ณด๊ฒ ์Šต๋‹ˆ๋‹ค: ๋จผ์ € ์—ฌ๋Ÿฌ๋ถ„์€ master ๋ธŒ๋žœ์น˜์— ์œ„์น˜ํ•ด ์žˆ์–ด์•ผํ•ฉ๋‹ˆ๋‹ค. ํ˜„์žฌ ์–ด๋–ค ๋ธŒ๋ž˜์น˜์— ์žˆ๋Š”์ง€ ํ™•์ธํ•ฉ๋‹ˆ๋‹ค.:

git status

ํ˜„์žฌ master ๋ธŒ๋žœ์น˜๊ฐ€ ์•„๋‹ˆ๋ผ๋ฉด ๋ณ€๊ฒฝํ•ฉ๋‹ˆ๋‹ค.:

git checkout master

์ œ ๊ณต๊ฐœ ์ €์žฅ์†Œ๋ฅผ ์•„์ง ์—ฌ๋Ÿฌ๋ถ„์˜ git์— ์ถ”๊ฐ€ํ•˜์ง€ ์•Š์•˜๋‹ค๋ฉด ๋‹ค์Œ ๋ช…๋ น์œผ๋กœ ์ถ”๊ฐ€ํ•ฉ๋‹ˆ๋‹ค. add upstream remote-url:

git remote add upstream https://github.com/Roshanjossey/first-contributions

์ง€์ •ํ•œ URL์„ ์ด์šฉํ•ด ํ˜„์žฌ ํ”„๋กœ์ ํŠธ์˜ ๋˜ ๋‹ค๋ฅธ ์ตœ์‹  ๋ฒ„์ „์ด ์žˆ๋Š”์ง€ git์—๊ฒŒ ํ™•์ธ์„ ์š”์ฒญํ•˜๋Š” ๋ฐฉ๋ฒ•์ž…๋‹ˆ๋‹ค. ๊ทธ๋ฆฌ๊ณ  ์šฐ๋ฆฌ๋Š” ์ด๋ฅผ upstream ์ด๋ผ๊ณ  ๋ถ€๋ฅด๊ธฐ๋กœํ•ฉ๋‹ˆ๋‹ค. ์ผ๋‹จ git์ด ์ด๋Ÿฌํ•œ ์ด๋ฆ„์„ ๊ฐ€์ง€๊ณ  ์žˆ๋‹ค๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๊ณต๊ฐœ ์ €์žฅ์†Œ์˜ ์ตœ์ง„ ๋ฒ„์ „์„ ๊ฐ€์ง€๊ณ  ์˜ต๋‹ˆ๋‹ค. :

git fetch upstream

์—ฌ๋Ÿฌ๋ถ„์€ ์ด์ œ ์ œ ํฌํฌ(upstream remote)์—์„œ ์ตœ์‹  ๋ฒ„์ „์„ ๋‚ด๋ ค ๋ฐ›์•˜์Šต๋‹ˆ๋‹ค. ์ด์ œ ๊ณต๊ฐœ ์ €์žฅ์†Œ์˜ ๋ณ€๊ฒฝ๋œ ๋‚ด์šฉ์„ ์—ฌ๋Ÿฌ๋ถ„์˜ master ๋ธŒ๋žœ์น˜์— ๋ณ‘ํ•ฉํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค.

git rebase upstream/master

์—ฌ๋Ÿฌ๋ถ„์˜ master ๋ธŒ๋žœ์น˜์™€ ๊ณต๊ฐœ ์ €์žฅ์†Œ๋ฅผ ๋ณ‘ํ•ฉํ•˜๊ณ  ๋‚˜๋ฉด ์ด์ œ ์—ฌ๋Ÿฌ๋ถ„์˜ ๋กœ์ปฌ๋จธ์‹ ์˜ master ๋ธŒ๋žœ์น˜๋Š” ์ตœ์‹  ์ƒํƒœ์ž…๋‹ˆ๋‹ค. ๋งˆ์ง€๋ง‰์œผ๋กœ ์—ฌ๋Ÿฌ๋ถ„์˜ master ๋ธŒ๋žœ์น˜๋ฅผ ์—ฌ๋Ÿฌ๋ถ„์˜ ํฌํฌ์— pushํ•˜๊ฒŒ ๋˜๋ฉด ํฌํฌํ•œ GitHub ๋˜ํ•œ ๋ณ€๊ฒฝ์‚ฌํ•ญ๋“ค์ด ๋ฐ˜์˜๋ฉ๋‹ˆ๋‹ค.:

git push origin master

origin์œผ๋กœ ๋ช…๋ช…๋œ ๋ฆฌ๋ชจํŠธ์— pushํ•˜๋Š” ๊ฒƒ์— ์ฃผ์˜ํ•˜์„ธ์š”. ์ด์ œ ์—ฌ๋Ÿฌ๋ถ„์˜ ๋ชจ๋“  ์ €์žฅ์†Œ๊ฐ€ ์ตœ์‹  ์ƒํƒœ๋ฅผ ์œ ์ง€ํ•˜๊ฒŒ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. ์ž˜ ํ•˜์…จ์Šต๋‹ˆ๋‹ค! GitHub ์ €์žฅ์†Œ์— ์ปค๋ฐ‹์ด ์ถ”๊ฐ€์ ์œผ๋กœ ๋ฐœ์ƒํ•  ๋•Œ๋งˆ๋‹ค ์ด๋Ÿฌํ•œ ์ž‘์—…์„ ํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค.