DevLog

(Git) ![rejected] main -> main (non-fast-forward) ํ•ด๊ฒฐ ๋ฐฉ๋ฒ• ๋ณธ๋ฌธ

๐Ÿ˜‚ Error-log

(Git) ![rejected] main -> main (non-fast-forward) ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•

Seungjae Lee 2021. 6. 29. 02:00

github์— ์—…๋กœ๋“œ๋ฅผ ํ•˜๊ณ  ์‹ถ์€ ๋””๋ ‰ํ„ฐ๋ฆฌ์—์„œ

git init

์œ„์˜ ๋ช…๋ น์–ด๋กœ ์ดˆ๊ธฐํ™”๋ฅผ ํ•˜๊ณ 

git remote add origin https://~

์œ„์˜ ๋ช…๋ น์–ด๋ฅผ ํ†ตํ•ด ์›๊ฒฉ ์ €์žฅ์†Œ ์„ค์ •์„ ํ•œ ์ดํ›„์—๋„

git pull ๋˜๋Š” git merge ๋ช…๋ น์–ด๋ฅผ ์‹œ๋„ํ•˜๋ฉด ์˜ค๋ฅ˜๊ฐ€ ๋‚˜์„œ

git push origin master

์œ„์˜ ๋ช…๋ น์–ด๋ฅผ ํ†ตํ•ด ์ฒ˜์Œ push๋ฅผ ํ•˜๋ ค๊ณ  ํ•  ๋•Œ push๋ฅผ ํ•  ์ˆ˜ ์—†๋Š” ๊ฒฝ์šฐ ์›์ธ๊ณผ ํ•ด๊ฒฐ๋ฐฉ๋ฒ•์€ ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค.

์›์ธ(์ถ”์ •)
: .gitignore ํŒŒ์ผ ๋˜๋Š” README.md ํŒŒ์ผ๋กœ ์ธํ•ด ๋ฐœ์ƒํ•œ๋‹ค๊ณ  ํ•จ.

์›์ธ
: ๊นƒํ—ˆ๋ธŒ์—์„œ ์ƒ์„ฑํ•œ README.md ๋งˆํฌ๋‹ค์šด ๋ฌธ์„œ ๋•Œ๋ฌธ์—

๋กœ์ปฌ ์ €์žฅ์†Œ์™€ ๋ฆฌ๋ชจํŠธ ์ €์žฅ์†Œ์˜ ์ƒํƒœ๊ฐ€ ๋™์ผํ•˜์ง€ ์•Š์•„ ์ƒ๊ธฐ๋Š” ์˜ค๋ฅ˜

(์ž„์‹œ)ํ•ด๊ฒฐ๋ฐฉ๋ฒ•
: push ํ•˜๋ ค๊ณ  ํ•˜๋Š” ๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ์•ž์— + ๋ฅผ ๋ถ™์—ฌ push

git push origin +main

ํ•ด๊ฒฐ๋ฐฉ๋ฒ•

: git pull origin main์„ ๋จผ์ € ํ•œ ํ›„์— git push origin main ํ•  ๊ฒƒ.


*ํ›„๊ธฐ *

ํ•ด๊ฒฐ์€ ๋˜์—ˆ์ง€๋งŒ ์ •ํ™•ํ•œ ์›์ธ๊ณผ ํ•ด๊ฒฐ๋ฐฉ๋ฒ•์„ ์•Œ์ง€ ๋ชปํ•จ

๊ธฐ์กด์˜ ๊นƒํ—ˆ๋ธŒ main ๋ธŒ๋žœ์น˜์— ์žˆ๋˜ '~~. md' ํŒŒ์ผ์ด ์‚ฌ๋ผ์ง€๊ณ 
์ƒˆ๋กœ push ํ•œ ํŒŒ์ผ๋“ค๋งŒ ๊นƒํ—ˆ๋ธŒ์— ์—…๋กœ๋“œ๋จ.
์œ„์™€ ๊ฐ™์€ ๋ฐฉ๋ฒ•์œผ๋กœ ํ•ด๊ฒฐํ•˜์˜€์„ ๋•Œ ํ•ด๋‹น ๋ ˆํŒŒ์ง€ํ† ๋ฆฌ์— ์žˆ๋Š” ๊ธฐ์กด์˜ ์ž๋ฃŒ๋“ค์ด ์‚ฌ๋ผ์งˆ ์ˆ˜ ์žˆ์œผ๋‹ˆ
์‚ฌ์šฉํ•˜๊ธฐ ์ „์— ๋ฐฑ์—…์„ ํ•ด๋‘๊ณ  ์‚ฌ์šฉํ•˜๊ธธ ๊ถŒ์žฅํ•จ.


+ ์ถ”๊ฐ€ ํ›„๊ธฐ (6/30)

์˜ค๋ฅ˜ ๋ฉ”์‹œ์ง€์˜ ์›์ธ์€ ๊นƒํ—ˆ๋ธŒ์—์„œ ์ถ”๊ฐ€ํ•œ README.md ๋งˆํฌ๋‹ค์šด ๋ฌธ์„œ๋ฅผ ๋กœ์ปฌ์—์„œ ์ฝ์–ด๋“ค์ด์ง€ ๋ชปํ•ด์„œ ์ƒ๊ธฐ๋Š” ์˜ค๋ฅ˜์˜€๋‹ค.

ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•์€ git pull origin main ์œผ๋กœ ๊นƒํ—ˆ๋ธŒ repository์™€ Local repository๋ฅผ ๋™๊ธฐํ™” ํ•ด์ฃผ๊ณ 

์ดํ›„์— git push origin main ์„ ํ•ด์ฃผ๋ฉด ๋ฌธ์ œ์—†์ด ๊นƒํ—ˆ๋ธŒ์— ์—…๋กœ๋“œ๊ฐ€ ์ž˜ ๋œ๋‹ค.


 

Comments