[Github] git merge

# ๋งˆ์Šคํ„ฐ ๋ธŒ๋žœ์น˜๋กœ ์ด๋™ git checkout main # ๋ธŒ๋žœ์น˜->๋งˆ์Šคํ„ฐ ๋จธ์ง€ git merge ImNakyung # ๋งˆ์Šคํ„ฐ ๋ธŒ๋žœ์น˜์— push git push [๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ, ์ถฉ๋Œ ๊ด€๋ฆฌ ์ฐธ๊ณ ์ž๋ฃŒ] goddaehee.tistory.com/275 [Git (10)] Git Branch(2) - ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉํ•˜๊ธฐ(git branch merge) [Git (10)] Git Branch(2) - ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉํ•˜๊ธฐ(git branch merge) ์•ˆ๋…•ํ•˜์„ธ์š”. ๊ฐ“๋Œ€ํฌ ์ž…๋‹ˆ๋‹ค. ์ด๋ฒˆ ํฌ์ŠคํŒ…์€ [ git branch ๋ณ‘ํ•ฉ ๋ฐ Conflict ํ•ด๊ฒฐํ•˜๊ธฐ ] ์ž…๋‹ˆ๋‹ค. : ) Git Merge โ€ป ๋ธŒ๋žœ์น˜์˜ ์‚ฌ์šฉ, ๋จธ์ง€.. goddaehee.tistory.com
GIT 2021. 1. 11. 16:18
1