Version Control with Git

University of Wisconsin Milwaukee Libraries

Apr 13-14, 2022

9:00 am - 11:00 am CDT

Instructors: Stephen Appel

Helpers: Ann Hanlon, Karl Holten

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 of version control with git. 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: Digital Humanities Lab, Golda Meir Library, 2311 E Hartford Ave, Milwaukee, Wisconsin. Get directions with OpenStreetMap or Google Maps.

When: Apr 13-14, 2022. 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 srappel@uwm.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.



Schedule

Wednesday Feb 9th

Before Pre-workshop survey
9:00 am Welcome and Introductions
9:05 am Automated Version Control
9:10 am Setting Up Git
9:15 am Creating a Repository
9:25 am Tracking Changes
9:45 am Break
9:50 am Exploring History
10:15 am Ignoring Things
10:20 am Branches
10:40 am Wrapping up
11:00 am Finish

Thursday Feb 10th

9:00 am Housekeeping
9:15 am Conflicts
9:30 am Remotes in GitHub
9:55 am Break
10:00 am Pull Requests
10:45 am Wrap-up and introduce further work
10:55 am Post-workshop Survey
11:00 am Finish

The lesson taught in this workshop is being piloted and a precise schedule is yet to be established. The workshop will include regular breaks. If you would like to know the timing of these breaks in advance, please contact the workshop organisers. For a list of lesson sections and estimated timings, visit the lesson homepage.


Setup

View the Setup Page.

We maintain a list of common issues that occur during installation as a reference for instructors that may be useful on the Configuration Problems and Solutions wiki page.

The setup instructions for this workshop can be found at the workshop overview site.