Suzie's Blog
Tag

conflict

#conflict

More content

Read more stories on Hashnode

Articles with this tag

[Git] conflict ๐Ÿ’ฅ

Aug 3, 20221 min read

์ฒ˜์Œ์œผ๋กœ team project๋Š” ์–ด๋–ป๊ฒŒ ๊ด€๋ฆฌ๋˜๋Š”์ง€ ๋ฐฐ์šธ ์ˆ˜ ์žˆ๋Š” ๋‚ ์ด์˜€๋‹ค. ๊ทธ ์ค‘์— conflict๋ž€ ๋ฌด์—‡์ด๊ณ  ์–ด๋–ป๊ฒŒ ํ•˜๋Š”์ง€ ์•Œ๊ฒŒ ๋˜์—ˆ๋Š”๋ฐ ์žŠ์–ด๋ฒ„๋ฆฌ๊ณ  ์‹ถ์ง€ ์•Š์•„์„œ ๋ธ”๋กœ๊ทธ์— ์ž‘์„ฑํ•œ๋‹ค. ๊ฐœ๋… branch์™€ branch์˜ merge๊ณผ์ •์—์„œ, ๋™์ผํ•œ ๋‚ด์šฉ์„ ๊ฐ์ž ๋‹ค๋ฅด๊ฒŒ...

[Git] conflict ๐Ÿ’ฅ