4. Version Control

• Why use version control

• Solo use of version control

• Publishing your code to GitHub

• Collaborating with others through Git

• Branching

• Rebasing and Merging

• Debugging with GitBisect

• Forks, Pull Requests and the GitHub Flow

Contents

• 4.0 Introduction to version control (10 minutes)

• 4.1 Solo work with git (15 minutes)

• 4.2 Fixing mistakes (10 minutes)

• 4.3 Publishing (15 minutes)

• 4.4 Collaboration (20 minutes)

• 4.5 Fork and Pull (10 minutes)

• 4.6 Git Theory (5 minutes)

• 4.7 Branches (10 minutes)

• 4.8 Advanced git concepts (15 minutes)

• 4.9 Publishing from GitHub (5 minutes)

• 4.10 Rebasing (10 minutes)

• 4.11 Debugging With git bisect (10 minutes)

• 4.12 Working with multiple remotes (10 minutes)

Total time: 2 hrs 25 minutes

Teaching notes

If you are teaching this course, please remove any .gitconfig files you might have in your home directory. It is fine to restore them once you’ve finished teaching but you may otherwise have settings that interfere with the examples shown here.

Exercises

Classroom exercises are included inline in the module. We recommend that instructors schedule the exercises to be done in groups during breaks in the taught content. However, it is important that participants also have some time away from their screens. Exercises can also be left as self-paced homework assignments if preferred.