Git tutorial part 5: working with branches

In this video we'll learn how to create and merge branches, and solve conflicts.
-----------------------
Video content:
0:00 - 0:54 : Introduction - what are branches and what are they good for? Branches allow you to work on a copy of your project, thus being able to make modifications without affecting the "original" version of the project. The recommended work-flow for working on projects in general is to create a branch of your project for every change you want to make, working on the change in the new branch only, leaving the "original" version of the project intact. When you are pleased with the modifications you've made, you can "merge" these changes back into the original version. This also facilitates team-work without "stepping on each other's toes", if every team-member works on changes on a different branch (in essence, a different copy of the code) and then "merging" each branch when it is deemed to be ready.
1:04 : git branch |branch-name|. Creates a new branch named |branch-name|.
1:14 : git branch -a. Shows all branches, marking the current branch with an *.
1:27 : git checkout |branch-name|. Changes the current branch to |branch-name|.
2:06 : git merge |branch-name|. Merges |branch-name| to the current branch.
2:29 : git lob --oneline --graph --decorate --all. Prints the version tree of the repo.
2:47 : Creating a conflict.
3:32 : Solving conflicts.
4:44 : git branch -d |branch-name|. Deletes the branch called |branch-name|. Note that deleting a branch whose last commit wasn't merged into master requires "-D".
5:20 : git lob --oneline --graph --decorate --all. Prints the version tree of the repo, including the conflict and the commit that solved it.

Remark: merges and conflicts can be handled using the command "git mergetool". Read up on it and try it out yourselves!
-----------------------
Relevant links:
Git cheatsheet (contains all the commands you need in a single file): https://www.git-tower.com/blog/git-cheat-sheet
The complete git tutorial playlist: https://www.youtube.com/playlist?list=PLuHmgt1HXB7CeioMqPMDgw5L3vYcWfqGT
In depth git tutorial: https://git-scm.com/docs/gittutorial
Better Git It In Your Soul: https://www.youtube.com/watch?v=hpZTtaWqxsQ
Note that you can use git on Windows and Mac too, if you follow these instructions: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git
The command-line usage is exactly the same as shown in the videos.