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 g...