๋ณธ๋ฌธ ๋ฐ”๋กœ๊ฐ€๊ธฐ
์ด์Šˆ๐Ÿ…/ํ•ด๊ฒฐ์™„๋ฃŒ

git ๋ณ‘ํ•ฉ ๋ฌธ์ œ ํ•ด๊ฒฐ๋ฒ•/git conflict

by @ENFJ 2022. 5. 31.

https://velog.io/@ha0kim/GIT-conflict-%EC%8B%9C-%ED%95%B4%EA%B2%B0%ED%95%98%EB%8A%94-%EB%B0%A9%EB%B2%95

 

[ GIT ] conflict ์‹œ ํ•ด๊ฒฐํ•˜๋Š” ๋ฐฉ๋ฒ•

Git ์—์„œ Conflict ์ด๋ž€?๊ฐœ๋ฐœ์ž๋“ค์ด ๊ฐ feature์„ ๋”ฐ์„œ ์ž‘์—…์„ ํ•˜๊ณ  master branch์— merge๋ฅผ ํ•˜๊ฒŒ๋œ๋‹ค.merge ๊ณผ์ •์—์„œ ํŒŒ์ผ์˜ ์ด๋ฆ„์ด ๊ฐ™์œผ๋ฉด ์ถฉ๋Œ์ด ๋ฐœ์ƒํ•œ๋‹ค.ํŒŒ์ผ์ด ๋‹ค๋ฅด๋ฉด ๋ฌด์กฐ๊ฑด ์ž๋™์œผ๋กœ ํ•ฉ์ณ์ค€๋‹ค.ํŒŒ์ผ

velog.io