Version Control with Git

This tutorial is intended for researchers who would like to use version control to manage their work. Version control is better than mailing files back and forth:

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).

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.

Prerequisites

In this lesson we learn how to use Git by using the GitHub Desktop client and the Atom text editor. You will need to install both of these applications before starting. You will also need to sign up for a GitHub account using the instructions here if you do not have one already. We will also go over how to do this during the lesson. No previous experience with a command line interface is necessary.

Formatting Notes

The following formatting conventions are used in this lesson:

Italics are used to indicate elements of a graphical interface, such as buttons, dropdowns, or labelled panes. In cases where there is a named field, bold italics indicate the field and regulary italics indicate the value that field should take.

Block text indicates folder names, file names, Git-specific ways to refer to a copy of a file, and code written in a programming language.

Hyperlinks are used to link new definitions back to the glossary.

Keyboard key formatting indicates keys that must be pressed to access some functionality in the GitHub Desktop client.

Schedule

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 using the GitHub Desktop graphical user interface?
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. Ignoring Things How can I tell Git to ignore files I don’t want to track?
00:45 6. Git Remotes How do I share my changes with others on the web?
01:15 7. Exploring History How can I identify old versions of files?
How do I review my changes?
How do I undo changes I made a long time ago?
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. Putting It All Together What does a typical Git workflow look like?
02:25 11. Licensing What licensing information should I include with my work?
02:30 12. Citation How can I make my work easier to cite?
02:32 13. Hosting Where should I host my version control repositories?
02:42 Finish

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