Git & GitHub Tutorial for Beginners #9 - Merging Branches (& conflicts)

From the creator

Hey all, in this git tutorial I'll show you how to merge branches back into the master branch. I'll also show you what to do when you encounter a git conflict. ----- COURSE LINKS: + Atom editor - https://atom.io/a + CMDER - http://cmder.net/ + GIT - https://git-scm.com/ --------------------------------------------------------------------------------------------- Related tutorials: ----- NODE.JS TUTORIALS https://www.youtube.com/playlist?list=PL4cUxeGkcC9gcy9lrvMJ75z9maRw4byYp ----- SUBSCRIBE TO CHANNEL - https://www.youtube.com/channel/UCW5YeuERMmlnqo4oq8vwUpg?sub_confirmation=1 ============== The Net Ninja ===================== For more front-end development tutorials & to black-belt your coding skills, head over to - https://www.youtube.com/channel/UCW5YeuERMmlnqo4oq8vwUpg or http://thenetninja.co.uk ================== Social Links ================== Twitter - @TheNetNinja - https://twitter.com/thenetninjauk

Published 2017-06-15 · Watch on YouTube ↗
Availability and playback restrictions are controlled by the original channel.