DevOps/GitHub

๐Ÿ“š Merge ๋ž€ ๋จธ์ง€,,?Merge๋ž€  ํ•œ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ์„ ๋‹ค๋ฅธ ๋ธŒ๋žœ์น˜์™€ ํ†ตํ•ฉํ•˜๋Š” ๊ธฐ๋Šฅ์ด๋‹ค.Merge ๋Œ€ํ•ด ์•Œ์•„๋ณด๊ณ  Repository๋ฅผ ๊ด€๋ฆฌํ•ด๋ณด์ž.git merge feature-branch ๐Ÿ’ฌ  Merge  (defualt)์ผ๋ฐ˜์ ์ธ Merge๋Š” ๋‘ ๋ธŒ๋žœ์น˜์˜ ์ปค๋ฐ‹ ํžˆ์Šคํ† ๋ฆฌ๋ฅผ ๋ชจ๋‘ ์œ ์ง€ํ•˜๋ฉด์„œ ์ƒˆ๋กœ์šด Merge Commit์„ ์ƒ์„ฑํ•œ๋‹ค. ํŠน์ง•์œผ๋กœ๋Š”โœ… ๋ชจ๋“  ์ปค๋ฐ‹ ํžˆ์Šคํ† ๋ฆฌ๊ฐ€ ๋ณด์กด๋œ๋‹ค.โœ… Merge ์ปค๋ฐ‹์ด ์ƒˆ๋กœ ์ƒ์„ฑ๋œ๋‹ค.โœ… ๋ธŒ๋žœ์น˜์˜ ์ž‘์—… ๋‚ด์—ญ์„ ๊ทธ๋Œ€๋กœ ํ™•์ธ ๊ฐ€๋Šฅํ•˜๋‹ค. ๐ŸŒฟ  Squash Merge (์••์ถ• ๋ณ‘ํ•ฉ)์—ฌ๋Ÿฌ ์ปค๋ฐ‹์„ ํ•˜๋‚˜์˜ ์ปค๋ฐ‹์œผ๋กœ ์••์ถ•ํ•˜์—ฌ ๋ณ‘ํ•ฉํ•˜๋Š” ๋ฐฉ์‹์ด๋‹ค.ํ˜„์žฌ ๋ธŒ๋žœ์น˜์—์„œ ๋ช‡ ๊ฐœ์˜ ์ปค๋ฐ‹์„ ์ž‘์„ฑํ•˜์—ฌ๋„, ๋จธ์ง€ ๋˜๋Š” ๋ธŒ๋žœ์น˜์—๋Š” ํ•˜๋‚˜์˜ ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋งŒ ๋‚จ๊ฒŒ ๋˜์–ด ํžˆ์Šคํ† ๋ฆฌ๋ฅผ ๋‹จ์ˆœํ™”ํ•œ๋‹ค.feature ๋ธŒ๋žœ์น˜์˜..
์ฐธ๊ณ  ์‚ฌ์ดํŠธ• Youtube - INFCON 2023 • FastCampus - ๋ชจ๋…ธ๋ ˆํฌ   ํ”„๋กœ์ ํŠธ๋ฅผ ๊ด€๋ฆฌํ•˜๊ธฐ ์œ„ํ•œ ๊นƒ ๋ ˆํฌ์ง€ํ† ๋ฆฌ ๊ด€๋ฆฌ ๋ฐฉ์‹์„ ์•Œ์•„๋ณด๋ คํ•œ๋‹ค.(์ด ๊ธ€์€ ํ˜„์žฌ ์ž‘์„ฑ์ž๊ฐ€ ์‹œ์ž‘ํ•˜๋Š” ๋™๋„ค์—์„œ ๋งŒ๋“œ๋Š” ํ”„๋กœ์ ํŠธ์—์„œ ์ ์šฉ๋˜๋Š” ๋ฉ€ํ‹ฐ๋ ˆํฌ์— ๋Œ€ํ•ด ์ค‘์ ์ ์œผ๋กœ ๋‹ค๋ค„๋ณผ๊นŒํ•œ๋‹ค.) ๐Ÿ“š ๋ฉ€ํ‹ฐ๋ ˆํฌ์ง€๊ธˆ๊นŒ์ง€ ์ž‘์„ฑ์ž๋Š” ํ† ์ด ํ”„๋กœ์ ํŠธ๋กœ ๊ฐ„๋‹จํžˆ ํ•˜๋‚˜ํ•˜๋‚˜ ๋งŒ๋“ค๋‹ค๋ณด๋‹ˆ ์ž์—ฐ์Šค๋Ÿฝ๊ฒŒ ๊ฐ ํ”„๋กœ์ ํŠธ๋งˆ๋‹ค ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ฅผ ์ƒ์„ฑํ•˜์˜€๋Š”๋ฐ ์ด๋Ÿฌํ•œ ๋ฐฉ์‹์„ '๋ฉ€ํ‹ฐ๋ ˆํฌ (Multi Repository)'๋ผ๊ณ  ํ•œ๋‹ค๊ณ  ํ•œ๋‹ค.  ๐Ÿ“ฆ ๋ชจ๋…ธ๋ ˆํฌ๋ชจ๋…ธ๋ ˆํฌ๋ž€, 'ํ•˜๋‚˜์˜ ์ €์žฅ์†Œ'๋ฅผ ์˜๋ฏธํ•˜๋Š” '๋ชจ๋†€๋ฆฌ์‹ (Monolithic Repository)'์˜ ์ค„์ž„๋ง๋กœ ๋งŽ์€ ํ”„๋กœ์ ํŠธ๋ฅผ ๋‹จ์ผ ์ €์žฅ์†Œ์— ์ €์žฅํ•˜๋Š” ๋ฐฉ๋ฒ•์„ ์˜๋ฏธํ•œ๋‹ค. โ“ ๊ทธ๋Ÿผ ์ด ๋ชจ๋…ธ๋ ˆํฌ๋Š” ์–ด๋– ํ•œ ์žฅ์  ๋•Œ๋ฌธ์— ํ”„๋ก ํŠธ์—”๋“œ์˜ ๊ฐœ..
์ฐธ๊ณ ์‚ฌ์ดํŠธ • Inpa Dev๋‹˜์˜ ํ‹ฐ์Šคํ† ๋ฆฌ git ๋ช…๋ น์–ด๋ฅผ ํ†ตํ•˜์—ฌ ์›๊ฒฉ ์ €์žฅ์†Œ์— ํ”„๋กœ์ ํŠธ๋ฅผ ๊ด€๋ฆฌํ•ด๋ณด์ž. ์•ž ๊ฒŒ์‹œ๊ธ€์—์„œ git clone์„ ํ†ตํ•ด ๋ฐ›์€ ํด๋”๋ฅผ ๋“ค์–ด๊ฐ€ ํด๋”์˜ ๋‚ด์šฉ์„ ๋ณ€๊ฒฝํ•ด๋ณด์ž. ๐Ÿ” git status ํด๋”์˜ ๋ณ€๊ฒฝ๋œ ๋‚ด์šฉ์„ ํŠธ๋ž˜ํ‚นํ•˜์—ฌ ์‚ฌ์šฉ์ž์—๊ฒŒ ๋ณด์—ฌ์ค€๋‹ค. ์ด๋•Œ, ๋นจ๊ฐ„์ƒ‰์œผ๋กœ ํ‘œ์‹œ๋œ ํŒŒ์ผ์€ ๋‚ด์šฉ์ด ๋ณ€๊ฒฝ๋˜์—ˆ์œผ๋‚˜, ์ €์žฅ์†Œ์— ๋“ฑ๋กํ•˜์ง€ ์•Š์„ ํŒŒ์ผ๋“ค์ด๊ณ  ๋…น์ƒ‰์œผ๋กœ ํ‘œ์‹œ๋˜๋Š” ํŒŒ์ผ๋“ค์€ ๋‚ด์šฉ์ด ๋ณ€๊ฒฝ๋˜์—ˆ๊ณ , ์ €์žฅ์†Œ์— ๋“ฑ๋กํ•  ํŒŒ์ผ๋“ค์ด๋‹ค. $ git status # ์ €์žฅ์†Œ์˜ ์ƒํƒœ๋ฅผ ์ฒดํฌํ•œ๋‹ค. # ์–ด๋–ค ํŒŒ์ผ์ด ์ €์žฅ์†Œ ์•ˆ์— ์žˆ๋Š”์ง€, ์ปค๋ฐ‹์ด ํ•„์š”ํ•œ ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์žˆ๋Š”์ง€, ํ˜„์žฌ ์ €์žฅ์†Œ์˜ ์–ด๋–ค ๋ธŒ๋žœ์น˜์—์„œ # ์ž‘์—…ํ•˜๊ณ  ์žˆ๋Š”์ง€ ๋“ฑ์„ ๋ณผ ์ˆ˜ ์žˆ๋‹ค. $ git status -s # git status์™€ ์œ ์‚ฌํ•˜๋‚˜ ์›Œํ‚น ํŠธ๋ฆฌ์˜ ์ƒํƒœ๋ฅผ ์š”์•ฝํ•ด..
์ฐธ๊ณ ์‚ฌ์ดํŠธ โˆ™ Git - Git ์„œ๋ฒ„ - SSH ๊ณต๊ฐœํ‚ค ๋งŒ๋“ค๊ธฐ ๐Ÿ”‘ SSH ๊ณต๊ฐœํ‚ค ๋กœ์ปฌ์—์„œ ๋ณธ์ธ๋งŒ์˜ ๊ฐœ๋ฐœ์„ ์œ„ํ•ด์„œ๋ผ๋ฉด ์•ž ๊ฒŒ์‹œ๊ธ€ ์ฒ˜๋Ÿผ SSH Key๊ฐ€ ์—†์ด๋„ Git์„ ์ด์šฉํ•  ์ˆ˜ ์žˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ ์™ธ๋ถ€ Git ์„œ๋ฒ„์˜ ์ฝ”๋“œ๋ฅผ ์‚ฌ์šฉํ•˜๋ ค๋ฉด SSH ํ”„๋กœํ† ์ฝœ์„ ์‚ฌ์šฉํ•ด์•ผํ•œ๋‹ค. ๋งŽ์€ Git ์„œ๋ฒ„๋“ค์€ SSH ๊ณต๊ฐœํ‚ค๋กœ ์ธ์ฆํ•œ๋‹ค. ๋‚ด ์ปดํ“จํ„ฐ๊ฐ€ ์•„๋‹Œ ๋„คํŠธ์›Œํฌ๋กœ ๋‹ค๋ฅธ ์ปดํ“จํ„ฐ์— ์ „๋‹ฌํ•ด์ฃผ๊ณ  ๊ฒฐ๊ณผ๋ฅผ ๋ฐ›์•„๋ณผ ์ˆ˜ ์žˆ๊ฒŒ ํ•ด์ฃผ๋Š”๊ฒŒ ๋ฐ”๋กœ SSH์ด๋‹ค. ๊ณต๊ฐœํ‚ค๋ฅผ ๋งŒ๋“œ๋Š” ๋ฐฉ๋ฒ•์€ ๋ชจ๋“  ์šด์˜์ฒด์ œ๊ฐ€ ๋น„์Šทํ•˜๋‹ค. ๐Ÿ”‘ ๊ณต๊ฐœํ‚ค ์ƒ์„ฑ ์‚ฌ์šฉ์ž์˜ SSH ํ‚ค๋“ค์€ ๊ธฐ๋ณธ์ ์œผ๋กœ ~/.ssh ๋””๋ ‰ํ† ๋ฆฌ์— ์ €์žฅํ•œ๋‹ค. $cd ~/.ssh $ls id_dsa๋˜๋Š” id_rsa๋ผ๋Š” ํŒŒ์ผ์˜ ์ด๋ฆ„์ด ๋ณด์ผ ๊ฒƒ์ด๊ณ  ๊ฐ™์€ ํŒŒ์ผ๋ช…์œผ๋กœ .pub์ด๋ผ๋Š” ํ™•์žฅ์ž๊ฐ€ ๋ถ™์€ ํŒŒ์ผ์ด ์žˆ์„ ๊ฒƒ์ด๋‹ค. ๊ทธ ์ค‘, .pu..
GitHub๋ฅผ ์‚ฌ์šฉํ•˜๊ธฐ ์œ„ํ•ด GitHub์— ์ ‘์†ํ•œ๋‹ค. https://github.com/ GitHub: Let’s build from here GitHub is where over 100 million developers shape the future of software, together. Contribute to the open source community, manage your Git repositories, review code like a pro, track bugs and fea... github.com ๐Ÿ’พ Repository ์ƒ์„ฑ ์ขŒ์ธก ์ƒ๋‹จ์— New๋ฅผ ํด๋ฆญํ•˜์—ฌ Repository ์ƒ์„ฑ ํŽ˜์ด์ง€๋กœ ์ด๋™ํ•œ๋‹ค. Owner *: ์ €์žฅ์†Œ์˜ ์†Œ์œ ์ž๋ฅผ ์ง€์ •ํ•œ๋‹ค. ๊ฐœ์ธ์ด ๋  ์ˆ˜๋„ Organization ๊ฐ’..
์ฐธ๊ณ  ์‚ฌ์ดํŠธ • ํ•œ๋น›์ถœํŒ๋„คํŠธ์›Œํฌ • ์„œ์ŠคํฌPAR๋‹˜์˜ ํ‹ฐ์Šคํ† ๋ฆฌ https://github.com/ GitHub: Let’s build from here GitHub is where over 100 million developers shape the future of software, together. Contribute to the open source community, manage your Git repositories, review code like a pro, track bugs and fea... github.com ๐Ÿ›ฐ๏ธ Git ๊นƒ์ด๋ž€, ๊ฐ„๋‹จํ•˜๊ฒŒ ํ”„๋กœ์ ํŠธ์˜ ๋ฒ„์ „, ์ƒํƒœ๋ฅผ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ํ˜•์ƒ๊ด€๋ฆฌ ๋„๊ตฌ์ด๋‹ค. ์›๊ฒฉ ์ €์žฅ์†Œ๋ฅผ ๋‘๊ณ  ํ”„๋กœ์ ํŠธ์˜ ์ƒํƒœ๋ฅผ ๊ธฐ๋กํ•˜๊ณ , ํ•ด๋‹น ์ƒํƒœ๋กœ ๋˜๋Œ๋ฆฌ๋Š” ๋ฒ„์ „ ๊ด€๋ฆฌ ์‹œ์Šคํ…œ์ด๋‹ค...
ma.caron_g
'DevOps/GitHub' ์นดํ…Œ๊ณ ๋ฆฌ์˜ ๊ธ€ ๋ชฉ๋ก