Learning Git 04: Branching, Merging, and Resolving Conflicts

In this tutorial I'll talk about the very very basics of branching, merging, and resolving conflicts. These topics, especially resolving conflicts, can get a lot more complex. This tutorial covers the basics to get you started!

Here's an overview of the commands we covered:
git log   # Display commits
git log --graph    # Display commits with a nice ASCII graph
git branch     # Display all branches (and the one we checked out)
git checkout     # Checkout a branch
git checkout -b     # Checkout a new branch
git branch -d      # Delete an already merged branch
git merge      # Merge a branch into the currently checked out branch


I also realized that the first 3 videos of these series were recorded on Linux. Woops.. I guess I killed the uniformity of this series! Maybe I'll record on Linux for the next video ;)

Thanks for watching!

• #science_technology
• #git
• #programming
• #version_control
• #software_engineering