๐Ÿธ ์ •๋ณด/Git 1

[Git: error] failed to push some refs to~ Error ํ•ด๊ฒฐ ๋ฐฉ

์†Œ์†Œํ•˜๊ฒŒ ๋ฌธ์ œ๋ฅผ ํ’€๋‹ค๊ฐ€ ๋กœ์ปฌ ์ €์žฅ์†Œ์—์„œ ๊นƒํ—ˆ๋ธŒ์˜ ์›๊ฒฉ ์ €์žฅ์†Œ๋กœ ์˜ฌ๋ฆฌ๋ ค๋Š”๋ฐ ํ‰์†Œ์™€ ๊ฐ™์€ ๋ช…๋ น์–ด๋ฅผ ์ณค๋Š”๋ฐ๋„ (add.. commit...push ....) ๊ฐ‘์ž๊ธฐ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. hint๋ฅผ ๋ณด๋‹ˆ ์ตœ์‹  ์ƒํƒœ๋ฅผ pull ํ•ด์˜ค๋ผ๊ณ  ํ•˜๋„ค์š”. $ git pull origin BranchName(ex. master, main) $ git push origin BranchName ์ €๋Š” ๋‹คํ–‰ํžˆ ์ด ๋ฐฉ๋ฒ•์œผ๋กœ ํ•ด๊ฒฐ์ด ๋๋Š”๋ฐ, ๋งŒ์•ฝ conflict๊ฐ€ ๋ฐœ์ƒํ•˜๊ฑฐ๋‚˜ ๋‹ค๋ฅธ ๋ฌธ์ œ๋กœ pull์ด ์•ˆ ๋˜๋Š” ๊ฒฝ์šฐ๋„ ์žˆ๋Š”๋ฐ, ์ด๋•Œ ์ถฉ๋Œํ•œ ์ฝ”๋“œ ์ค‘ ์ง์ ‘ ํ™•์ธํ•˜๊ณ  ์„ ํƒํ•˜๊ณ  ์‹ถ๋‹ค๋ฉด ์ง์ ‘ ์›์ธ์„ ๊ณ ์ณ์ฃผ๊ณ  ๋ณ‘ํ•ฉํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. (conflict resolve) merge๋Š” ๋ณต์žกํ•˜๊ณ  ์–ด๋ ค์›Œ์„œ ์ •ํ™•ํžˆ ์•Œ๊ฒŒ ๋˜๋ฉด ์ •๋ฆฌํ•ด์•ผ๋  ๊ฒƒ ๊ฐ™์•„์š”. ๐Ÿ˜‘ ์ด๋Ÿฐ๊ฑด ํ•„์š” ์—†๊ณ ..