๊ด€๋ฆฌ ๋ฉ”๋‰ด

yeon's ๐Ÿ‘ฉ๐Ÿป‍๐Ÿ’ป

๋งฅ[MAC]์—์„œ ๊นƒํ—ˆ๋ธŒ ํด๋” pushํ•˜๋Š” ๋ฒ• ๋ณธ๋ฌธ

Computer ๐Ÿ’ป/Git

๋งฅ[MAC]์—์„œ ๊นƒํ—ˆ๋ธŒ ํด๋” pushํ•˜๋Š” ๋ฒ•

yeon42 2022. 1. 6. 01:51
728x90

+++

ํด๋” ์ „์ฒด๋ฅผ ์—…๋กœ๋“œ ํ•˜๋ ค๋ฉด ํ•ด๋‹น ํด๋”์˜ ์ƒ์œ„ ํด๋”์—์„œ ์ž‘์—…ํ•˜๊ธฐ

git config --global user.name "์ด๋ฆ„"

git config --global user.email "์ด๋ฉ”์ผ"

git clone "๋ ˆํฌ์ฃผ์†Œ"

 

๊ทธ๋‹ด clone ๋ฐ›์€ ์ฃผ์†Œ์—์„œ ์ž‘์—…ํ•˜๊ธฐ

git remote add origin "๋ ˆํฌ ์ฃผ์†Œ"

(git remote -v ๋กœ ํ™•์ธ)

(์ง€์šฐ๋ ค๋ฉด git remote rm origin)

git add ์›ํ•˜๋Š” ํŒŒ์ผ

(git add .)

git commit -m "์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€"

git push -u origin main

 

 

 


 

 

๊นƒ ............ ์ง–ใ„ด์งœ ์ฃฝ์ผ๊นŒ ..........

๊ณ„์† ๊ณ„์† ๊ณ„์† ์˜ค๋ฅ˜๊ฐ€ ๋– ์„œ repo ๋งŒ๋“ค๊ณ  ์‹œํ—˜ํ•ด๋ณด๊ณ  ๋งŒ๋“ค๊ณ  ์‹œํ—˜ํ•ด๋ณด๊ณ  .........

2์‹œ๊ฐ„๋งŒ์— ํ•ด๊ฒฐ ...........

 

์•„ ๋†” ๋„ˆ๋ฌด ์ž๊ณ  ์‹ถ์€๋ฐ ๊นŒ๋จน๊ธฐ ์ „์— ์ ์–ด๋†“๊ธฐ ........ A-ny ๊ทผ๋ฐ ์ •ํ™•ํ•œ ์›๋ฆฌ๋ฅผ 100% ์ดํ•ดํ•˜์ง„ ๋ชปํ•จ .....

์ผ๋‹จ ํ„ฐ๋ฏธ๋„ ๋ณต.๋ถ™

 

 

 

 

์ผ๋‹จ !!!!!

https://kkangsg.tistory.com/m/83

 

[GitHub] Repository์— 'main' branch๋กœ push ํ•˜๊ธฐ

ํด๋” ๋ฐ ํŒŒ์ผ๋กœ ์ฝ”๋“œ์ž‘์„ฑ์„ ๋‹ค ํ•œ ๋’ค, ์›๊ฒฉ์ €์žฅ์†Œ์— ์ €์žฅํ•˜๋ ค๊ณ  ํ•œ๋‹ค. ๊นƒํ—ˆ๋ธŒ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์—์„œ ์ดˆ๋ก์ƒ‰ New ๋ฒ„ํŠผ์„ ๋ˆŒ๋Ÿฌ์„œ commit-test ๋ผ๋Š” ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ฅผ ๋งŒ๋“ค์–ด๋ณด๊ฒ ๋‹ค. 3๊ฐœ์˜ ์ฒดํฌ ๋ฐ•์Šค ์ค‘ ์ฒซ ๋ฒˆ์งธ

kkangsg.tistory.com

์ด ๋ธ”๋กœ๊ทธ๋ฅผ ๊ธฐ๋ฐ˜์œผ๋กœ ๋”ฐ๋ผํ–ˆ๋‹ค. ๋„ˆ๋ฌด ์นœ์ ˆํ•˜๊ฒŒ ์„ค๋ช…์„ ์ž˜ ํ•ด์ฃผ์…”์„œ ๋”ฐ๋ผ๊ฐ์— ๋ฌธ์ œ๊ฐ€ ์—†์—ˆ๋Š”๋ฐ .....

๋‚˜๋Š” $ git pull origin main ์—์„œ ๊ณ„์† ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์—ˆ์Œ

 

https://ndb796.tistory.com/275

 

๊นƒ(Git) fatal: refusing to merge unrelated histories ์˜ค๋ฅ˜

๊นƒ์„ ์ด์šฉํ•  ๋•Œ ์ข…์ข… fatal: refusing to merge unrelated histories๋ผ๋Š” ์˜ค๋ฅ˜๋ฅผ ํ™•์ธํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด ์˜ค๋ฅ˜๋Š” git push๋ฅผ ์ง„ํ–‰ํ•  ๋•Œ๋‚˜ ํ˜น์€ git pull์„ ์ง„ํ–‰ํ•  ๋•Œ ๋ฐœ๊ฒฌํ•  ์ˆ˜ ์žˆ๋Š” ์˜ค๋ฅ˜์ž…๋‹ˆ๋‹ค. ๋กœ..

ndb796.tistory.com

์ด๋ฅผ ์ฐธ๊ณ ํ•ด --allow-unrealted-histories๋ฅผ ์ถ”๊ฐ€ํ•ด์ฃผ์—ˆ๊ณ ,

๊ทธ๋žฌ๋”๋‹ˆ merge ์–ด์ฉŒ๊ตฌ ์˜ค๋ฅ˜๊ฐ€ ๊ณ„์† ๋– ์„œ

 

https://www.lesstif.com/gitbook/git-pull-you-have-not-concluded-your-merge-merge_head-exists-23757078.html

 

git pull ์‹คํŒจ - You have not concluded your merge (MERGE_HEAD exists)

 

www.lesstif.com

์ด๋ฅผ ๊ธฐ๋ฐ˜์œผ๋กœ $ git merge --abort๋ฅผ ํ•ด ๋จธ์ง€๋ฅผ ์ทจ์†Œํ•˜๊ณ  ๋‹ค์‹œ pull์„ ๋ฐ›์•„์™”๋‹ค.

 

์ค‘๊ฐ„์— commit ์–ด์ฉŒ๊ตฌ ์˜ค๋ฅ˜๋Š” ๋‚ด๊ฐ€ addํ•˜๊ณ ๋‚˜์„œ commit์„ ์•ˆ ํ•ด์„œ ์ƒ๊ธด ์˜ค๋ฅ˜์ธ ๊ฒƒ ๊ฐ™๊ณ  ใ…‹ใ…‹ .......

 

 

๋‚ผ ๋ง‘์€ ๋งˆ์Œ์œผ๋กœ ํ•œ ๋ฒˆ ๋‹ค์‹œ ํ•ด๋ณด๊ฒ ์–ด

 

** ์ผ๋‹จ ์ค‘์š”ํ•œ ๊ฑด

ํ„ฐ๋ฏธ๋„์—์„œ default branch๊ฐ€ master์ด๊ธฐ ๋•Œ๋ฌธ์— main์— pushํ•˜๊ณ ์‹ถ๋‹ค๋ฉด

$ git branch -m [์›๋ž˜ branch] [๋ณ€๊ฒฝํ•  branch] ๋ฅผ ํ†ตํ•ด ๋ธŒ๋žœ์น˜๋ฅผ ๋ณ€๊ฒฝํ•ด์ฃผ์–ด์•ผ ํ•œ๋‹ค๋Š” ์ !!

์ด๋Š” ์ฒซ ๋ฒˆ์งธ ๋ธ”๋กœ๊ทธ์— ์•„์ฃผ ์ž์„ธํžˆ ์„ค๋ช…๋˜์–ด์žˆ๋‹ค.

 

push์—์„œ ํ•œ์ฐธ์„ ํ—ค๋งธ๋˜ ๋‚˜ .... ๋น„์ •์ƒ์ž…๋‹ˆ๋‹ค ..... ํก

๊นƒ ๋ฟŒ์‹œ์ž !!!

 

 

 

 


 

 

+ https://velog.io/@unu/%EA%B9%83-%ED%84%B0%EB%AF%B8%EB%84%90%EB%A1%9C-%EA%B9%83%ED%97%88%EB%B8%8C%EC%97%90-%EB%82%B4-%ED%8C%8C%EC%9D%BC%ED%8F%B4%EB%8D%94-%EC%98%AC%EB%A6%AC%EA%B8%B0

 

[๊นƒ] ํ„ฐ๋ฏธ๋„๋กœ ๊นƒํ—ˆ๋ธŒ์— ๋‚ด ํŒŒ์ผ+ํด๋” ์˜ฌ๋ฆฌ๊ธฐ

์ฒซ ํ”„๋กœ์ ํŠธ๋ฅผ ์–ด๋А์ •๋„ ๋งˆ๋ฌด๋ฆฌํ•˜๊ณ  ๊นƒํ—ˆ๋ธŒ์— ์˜ฌ๋ฆฌ๋ ค๊ณ  ํ•˜๋Š”๋ฐ , ์ด๋Ÿด์ˆ˜๊ฐ€ ์™œ ํŒŒ์ผ๋งŒ ์—…๋กœ๋“œ ๋˜๋Š”๊ฑฐ์ง€..? ํด๋” ์งธ๋กœ ์—…๋กœ๋“œ๋„ ์•ˆ๋˜๊ณ  ํŒŒ์ผ ์ด๋ฆ„๋„ ๋ฐ”๊ฟ€ ์ˆ˜ ์—†๋‹ค. '๊นƒํ—ˆ๋ธŒ๋Š” ์ •๋ง ์ €์žฅ์†Œ์˜ ์—ญํ• ์„

velog.io

๊ฐ•์ œ์ ์œผ๋กœ pushํ•˜๋ ค๋ฉด ๋์— -f ๋ฅผ ๋ถ™์ด๋ผ๊ณ  ํ•œ๋‹ค.

 

 

 

+ https://y-oni.tistory.com/126

 

๐Ÿ’› [๊นƒ & ๊นƒํ—ˆ๋ธŒ ์‚ฌ์šฉ๋ฒ•] ๊นƒํ—ˆ๋ธŒ์— ํด๋” ์—…๋กœ๋“œ ํ•˜๋Š” ๋ฒ•

Github์— ํด๋” ์—…๋กœ๋“œํ•˜๋Š” ๋ฐฉ๋ฒ• 1. git์— ํ”„๋กœ์ ํŠธ ๋ฆฌํŒŒ์ง€ํ† ๋ฆฌ ์ƒ์„ฑ 2. github์— ์—…๋กœ๋“œํ•  ํด๋”์˜ ์ƒ์œ„ ํด๋”์—์„œ git bash ์—ด๊ธฐ (ex. yony/go/section01 ์—์„œ section01 ํด๋” ์ „์ฒด๋ฅผ git์— ์—…๋กœ๋“œํ•˜๊ณ ์‹ถ๋‹ค๋ฉด yony/..

y-oni.tistory.com

๋งฅ์—์„œ๋Š” git bash๋ฅผ ์ด์šฉํ•˜๋ผ ํ•ด์„œ zsh->bash๋กœ ๋ณ€๊ฒฝํ•˜๊ณ  ์œ„ ๋ธ”๋กœ๊ทธ๋ฅผ ๋”ฐ๋ผํ•ด๋ดค๋Š”๋ฐ๋„ ์ž˜ ์•ˆ ๋๋‹ค !

Comments