Version Control with Git

Version control is the lab notebook of the digital world: it’s what professionals use to keep track of what they’ve done and to collaborate with other people. Every large software development project relies on it, and most programmers use it for their small jobs as well. And it isn’t just for software: books, papers, small data sets, and anything that changes over time or needs to be shared can and should be stored in a version control system.

The advantages of version control over, say, emailing files back and forth, are:

Teams are not the only ones to benefit from version control: lone researchers can benefit immensely. Keeping a record of what was changed, when, and why is extremely useful for all researchers if they ever need to come back to the project later on (e.g., a year later, when memory has faded).

Prerequisites

In this lesson we use Git from the Unix Shell. Some previous experience with the shell is expected, but isn’t mandatory.

Git is not Github

It’s important to note that git and github are not the same thing. Git is the version control system, that stores history is a repository. Github is a website that hosts git repositories.

In this workshop we will use git on your local machine first to create a toy experiment, where Alice and Bob will collaborate on creating a Support Vector Machine to classify digits (like MNIST). We’ll then learn how we can store this repo on github.

Schedule

Setup Download files required for the lesson
00:00 1. Automated Version Control What is version control and why should I use it?
00:05 2. Setting Up Git How do I get set up to use Git?
00:10 3. Creating a Repository Where does Git store information?
00:20 4. Tracking Changes How do I record changes in Git?
How do I check the status of my version control repository?
How do I record notes about what changes I made and why?
00:40 5. Exploring History How can I identify old versions of files?
How do I review my changes?
How can I recover old versions of files?
01:05 6. Ignoring Things How can I tell Git to ignore files I don’t want to track?
01:10 7. Remotes in GitHub How do I share my changes with others on the web?
01:40 8. Collaborating How can I use version control to collaborate with other people?
02:05 9. Conflicts What do I do when my changes conflict with someone else’s?
02:20 10. Branching How can I work without affecting other people?
02:35 11. Tags How do I label my work?
02:40 12. DIAG How does the DIAG Organisation work?
02:45 Finish

The actual schedule may vary slightly depending on the topics and exercises chosen by the instructor.