Introduction to Version Control with Git

UC Santa Barbara Library

Apr 25-26, 2023

9:30 am - 12:00 pm PST

Instructors: Seth Erickson, Greg Janée, Kristi Liu

Helpers: Jon Jablonski, Julien Brun

Registration for this workshop begins on March 31, 2023 at 8:00 am PST.

Some adblockers block the registration window. If you do not see the registration box above, please check your adblocker settings.

General Information

Software Carpentry aims to help researchers get their work done in less time and with less pain by teaching them basic research computing skills. This hands-on workshop will cover basic concepts and tools, including program design, version control, data management, and task automation. Participants will be encouraged to help one another and to apply what they have learned to their own research problems.

For more information on what we teach and why, please see our paper "Best Practices for Scientific Computing".

Who: The course is aimed at graduate students and other researchers. You don't need to have any previous knowledge of the tools that will be presented at the workshop.

Where: Room 1312, Davidson Library, 525 U-Cen Rd, Santa Barbara, CA. Get directions with OpenStreetMap or Google Maps.

When: Apr 25-26, 2023. Add to your Google Calendar.

Requirements: Participants must bring a laptop with a Mac, Linux, or Windows operating system (not a tablet, Chromebook, etc.) that they have administrative privileges on. They should have a few specific software packages installed (listed below).

Accessibility: We are committed to making this workshop accessible to everybody. For workshops at a physical location, the workshop organizers have checked that:

Materials will be provided in advance of the workshop and large-print handouts are available if needed by notifying the organizers in advance. If we can help making learning easier for you (e.g. sign-language interpreters, lactation facilities) please get in touch (using contact details below) and we will attempt to provide them.

Contact: Please email dreamlab@library.ucsb.edu for more information.

Roles: To learn more about the roles at the workshop (who will be doing what), refer to our Workshop FAQ.


Code of Conduct

Everyone who participates in Carpentries activities is required to conform to the Code of Conduct. This document also outlines how to report an incident if needed.


Surveys

Please be sure to complete these surveys before and after the workshop.

Pre-workshop Survey

Post-workshop Survey


Schedule

Setup Download files required for the lesson
Day 1 09:30 1. Introduction What is version control and why should I use it?
09:35 2. Shell: Navigating Files and Directories How can I move around on my computer?
How can I see what files and directories I have?
How can I specify the location of a file or directory on my computer?
10:15 3. Shell: Working With Files and Directories How can I create, copy, and delete files and directories?
How can I edit files?
11:05 4. Break Break
11:15 5. Setting Up Git How do I get set up to use Git?
11:30 6. Creating a Repository Where does Git store information?
11:40 7. 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?
12:00 Finish
Day 2 09:30 8. Exploring History How can I identify old versions of files?
How do I review my changes?
How can I recover old versions of files?
09:55 9. Ignoring Things How can I tell Git to ignore files I don’t want to track?
10:00 10. Remotes in GitHub How do I share my changes with others on the web?
10:30 11. Break Break
10:40 12. Collaborating How can I use version control to collaborate with other people?
11:20 13. Conflicts What do I do when my changes conflict with someone else’s?
12:05 Finish

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


Setup

See setup instructions