Beginner Git and GitHub #7 - Merging Branches and Handling Conflicts

Описание: Step-by-step video teaches you how to merge branches within git and how to handle the most common merge conflict!

git commands used in this videoL
git branch
git checkout [branch name]
git merge [branch name]
git log --oneline

How to install Git Bash:    • How to Install Git Bash on Windows 10  

Support the Channel:
1) Subscribe:
2) DataCamp:
3) Udacity: