Workshop Overview

At its most basic level, version control software helps us register and track sets of changes made to files on our computer. We can then reason about and share those changes with others. Version control software and tools (such as Git and Subversion/SVN) are often associated with software development, and increasingly, they are being used to collaborate in research and academic environments.

In this session, we’ll extend what we learned in Session 1 and explore how to enhance collaboration by leveraging Git and GitHub. GitHub is a popular website for hosting and sharing and collaborating on Git repositories remotely.

Objectives

1. Explain what remote repositories are and why they are useful
2. Push to or pull from a remote repository
3. Clone a remote repository
4. Collaborate by pushing to a common repository
5. Describe a basic collaborative workflow
6. Explain what conflicts are and when they can occur and how to resolve conflicts resulting from a merge

In this lesson, we further use Git from the Unix Shell and explore GitHub. Please review episodes 1-5 from the git carpentries curriculum, which we covered in the previous session before attending this workshop.

Bring your laptop.

Please see this section of the workshop template for instructions on installing Git and preparing for the workshop. You will need an account at github.com for parts of the Git lesson. If you’d like help to set up your shell environment, install Git, and set up a user account in Github, please contact cds@nd.edu.

You can take this workshop to build toward the completion of either the Software or Library Carpentries lesson series. This workshop is taught by a Carpentries-certified instructor.