Version Control with Git

University of Florida

2023 March 24

9:00 - 15:00 ET

Instructors: Cory Brunson, Dellena Bloom

Helpers: Vaasuki Marupaka, CJ Campbell

General Information

Where: UFII Room (CISE E252), University of Florida Informatics Institute, 432 Newell Drive, Gainesville, FL. Get directions with OpenStreetMap or Google Maps.

When: 2023 March 24. 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 cornelioid@gmail.com for more information.

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

Registration

Space is limited to 24 participants for this workshop, and registration is required. The workshop fee is $5 for coffee/snacks only or $15 for lunch as well. Please plan on attending the entire time.

Register for this workshop!


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.


Collaborative Notes

We will use this collaborative document for chatting, taking notes, and sharing URLs and bits of code.


Surveys

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

Pre-workshop Survey

Post-workshop Survey


Schedule

This workshop is teaching a lesson in The Carpentries Incubator. Please check the lesson homepage for a list of lesson sections and estimated timings. The scheduled times below are based on these estimates.

Morning

Before starting Pre-workshop survey
09:00 Setup
09:10 Automated Version Control
09:20 Setting Up Git
09:25 Creating a Repository
09:35 Tracking Changes
09:55 Exploring History
10:20 Ignoring Things
10:25 Coffee Break
10:45 Branches
11:05 Conflicts
11:20 Remotes in GitHub

Afternoon

12:00 Lunch Break
13:30 Pull Requests
14:15 Open Science
14:25 Licensing
14:30 Citation
14:35 Hosting
14:45 Using Git from RStudio
15:00 Wrap
After ending Post-workshop survey

Setup

To participate in a workshop, you will need access to software as described below. In addition, you will need an up-to-date web browser.

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.

Please check the “Setup” page of the lesson site for instructions to follow to obtain the software and data you will need to follow the lesson.