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: https://www.youtube.com/watch?v=qdwWe9COT9k Support the Channel: 1) Subscribe: https://www.becomingads.com/o/youtube 2) DataCamp: https://www.becomingads.com/o/datacamp 3) Udacity: https://www.becomingads.com/o/udacity