๋ฐ˜์‘ํ˜•

git pr conflict 1
[ Git & Github ] PR์‹œ ๋ฐœ์ƒํ•˜๋Š” Conflict ํ•ด๊ฒฐํ•˜๊ธฐ

์•ˆ๋…•ํ•˜์„ธ์š”~ ์˜ค๋Š˜์€ PR์‹œ์— ๋ฐœ์ƒํ•˜๋Š” Conflict๋ฅผ ํ•ด๊ฒฐํ•˜๋Š” ๋ฐฉ๋ฒ•์— ๋Œ€ํ•ด์„œ ์ž‘์„ฑํ•˜๋ ค๊ณ  ํ•ฉ๋‹ˆ๋‹ค : ) ์•„์ง์€ Git์„ ๋‹ค๋ฃจ๋Š” ๊ฒŒ ์–ด๋ ค์›Œ์„œ ๋ฌธ์ œ๊ฐ€ ์ƒ๊ธธ ๋•Œ๋งˆ๋‹ค ์ •๋ฆฌํ•ด๋ณด๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค. ์•„์ง์€ ํŠน๋ณ„ํ•œ ๋‚ด์šฉ์ด ์—†์ง€๋งŒ ๊ทธ๋ž˜๋„ ๊ธฐ๋ก ์ค‘์ด๋‹ˆ ํ•„์š”ํ•˜์‹  ๋ถ„๋“ค์€ ๋ณด์…”๋„ ์ข‹์Šต๋‹ˆ๋‹ค. Git & Github A new tool for teams & individuals that blends everyday work apps into one. jasper-atom-7c6.notion.site 1. ๋™์ผ ์ €์žฅ์†Œ์—์„œ branch ๊ฐ„์˜ conflict - Pull Request ํƒ€๊ฒŸ ๋ธŒ๋žœ์น˜์˜ ๋ณ€๊ฒฝ ์‚ฌํ•ญ์„ Pull Request source ๋ธŒ๋žœ์น˜๋กœ ๊ฐ€์ ธ์˜ค๋ฉด ๋ฉ๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด๋ณด๊ฒ ์Šต๋‹ˆ๋‹ค. feature/* ๋ธŒ๋žœ์น˜์—์„œ master ๋ธŒ๋žœ์น˜..
Git & Github 2022.09.24
1
๋”๋ณด๊ธฐ
๋ฐ˜์‘ํ˜•

ํ‹ฐ์Šคํ† ๋ฆฌํˆด๋ฐ”