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

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 - CMDER - GIT - --------------------------------------------------------------------------------------------- Related tutorials: ---— TUTORIALS ---— SUBSCRIBE TO CHANNEL - ============== The Net Ninja ===================== For more front-end development tutorials & to black-belt your coding skills, head over to - or http: ... #TheNetNinja #git #github #git_tutorial #git_tutorial_for_beginners #github_tutorial #github_tutorial_for_beginners #what_is_git #what_is_github #git_vs_github 20170615 XX-Kct0PfFc