728x90

๊นƒํ—ˆ๋ธŒํ˜‘์—… 2

[GitHub] ๋ธŒ๋žœ์น˜ ๋ฎ์–ด ์”Œ์šฐ๊ธฐ

๋ณ€๊ฒฝ๋œ Upstream branch๋ฅผ develop branch๋กœ ๋ฎ์–ด์”Œ์šฐ๊ธฐ (์ตœ์‹ ์ƒํƒœ๋ฅผ pull) upstream์„ remote๋กœ ๋“ฑ๋ก upstream ๋‚ด์šฉ fetch develop branch์™€ upstream ๋ณ‘ํ•ฉ -> ์—ฌ๊ธฐ๊นŒ์ง€ ํ•˜๋ฉด ๋‚ด ์ฝ”๋“œ๊ฐ€ ์ตœ์‹  ์ฝ”๋“œ๋กœ ๋ฐ”๋€œ ๋‹ค์Œ ์ž‘์—…์„ ์œ„ํ•ด ์ง€๊ธˆ develop branch๋ฅผ push git remote add upstream "upstream git ์ฃผ์†Œ" git fetch upstream git merge upstream/develop git push origin develop (merge๋Š” upstream์ด ์ตœ์‹  ์ƒํƒœ๊ฐ€ ๋˜์—ˆ๋‹ค๋Š” ๋œป, ๋‚˜์™€ ํ˜‘์—…์ž๋“ค์€ ์ด ์ตœ์‹ ์˜ upstream์„ ๋‹ค์‹œ pull๋ฐ›์•„ ์ตœ์‹  ํ™˜๊ฒฝ์—์„œ ์ƒˆ๋กญ๊ฒŒ ์ž‘์—…ํ•ด์•ผํ•จ) ์ฐธ๊ณ : medium.com/..

Git 2021.03.04

[Git] GIT, GitHub ๊ฐœ๋…, Git ํ˜‘์—…

Git VCS(Version Control System) ์ค‘ ํ•˜๋‚˜, ๋ฒ„์ „ ๊ด€๋ฆฌ ์‹œ์Šคํ…œ ๋ถ„์‚ฐ ์†Œ์Šค ๋ฒ„์ „ ๊ด€๋ฆฌ ์‹œ์Šคํ…œ ์„œ๋ฒ„๋ฅผ ๋ถ„์‚ฐ์‹œ์ผœ ๊ตฌ์ถ•ํ•  ์ˆ˜ ์žˆ๊ฒŒ ํ•˜๋Š” software ์†Œ์Šค์ฝ”๋“œ๋ฅผ ํšจ์œจ์ ์œผ๋กœ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๊ฒŒ ํ•ด์ฃผ๋Š” ๋„๊ตฌ Github Git์˜ ๋ฐ์ดํ„ฐ๋ฅผ ์ €์žฅํ•˜๋Š” ์„œ๋ฒ„ Git ์—…๋กœ๋“œํ•  ์ˆ˜ ์žˆ๋Š” ์›น์‚ฌ์ดํŠธ ๊ฐœ๋ฐœ์ž๋“ค์ด ํ˜‘์—… ์‹œ ์‚ฌ์šฉํ•˜๋Š” ํ”Œ๋žซํผ ํ•œ ๊ฐœ์˜ ๋ฉ”์ธ ์„œ๋ฒ„์— ์—ฌ๋Ÿฌ ๊ฐœ์˜ ๋กœ์ปฌ ์ปดํ“จํ„ฐ(์—ฌ๋Ÿฌ๋ช…์˜ ์‚ฌ์šฉ์ž)๊ฐ€ ์ ‘์†ํ•ด ์†Œํ†ตํ•˜๋Š” ๋ฐฉ์‹ ๊ฐ์ž์˜ ์ปดํ“จํ„ฐ์— (๋ฐฑ์—…ํ•˜๋Š” ๋ฐฉ์‹์œผ๋กœ) ๋ถ„์‚ฐ๋˜์–ด ์žˆ๋‹ค. ๋‚ด ๋กœ์ปฌ ์ปดํ“จํ„ฐ ๋‚ด์— ์žˆ๋Š” ๋ธŒ๋žœ์น˜(branch): ๋กœ์ปฌ ๋ธŒ๋žœ์น˜ ์™ธ๋ถ€ ์„œ๋ฒ„์— ์žˆ๋Š” ๋ธŒ๋žœ์น˜: ๋ฆฌ๋ชจํŠธ ๋ธŒ๋žœ์น˜(์›๊ฒฉ ๋ธŒ๋žœ์น˜) ๋ช‡ ๊ฐ€์ง€ Git ๋ช…๋ น์–ด merge ํ•œ ๋ธŒ๋žœ์น˜์—์„œ ์™„์„ฑํ•œ ์ž‘์—…์„ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜์— ๋ณ‘ํ•ฉํ•˜๊ธฐ add ์ˆ˜์ •ํ•œ ์ฝ”๋“œ ์„ ํƒํ•ด ์ถ”๊ฐ€ co..

Git 2021.01.16
728x90