Version Control with Git and GitHub

Digital Humanities & Research Software Engineering Summer School 2025 – DISKAH Training

July 3rd, 2025

11:00-17.00 BST

Instructors: Samantha Finnigan, Zey Aki

General Information

The Carpentries project comprises the Software Carpentry, Data Carpentry, and Library Carpentry communities of Instructors, Trainers, Maintainers, helpers, and supporters who share a mission to teach foundational computational and data science skills to researchers.

Want to learn more and stay engaged with The Carpentries? Carpentries Clippings is The Carpentries' biweekly newsletter, where we share community news, community job postings, and more. Sign up to receive future editions and read our full archive: https://carpentries.org/newsletter/

Part of the RSE training delivered to the DISKAH Fellows’ cohort, this training will take place during the DH & RSE Summer School 2025. The Summer School is co-organised by King’s College London, University of Cambridge and University of Edinburgh, in collaboration with Digital Skills in Arts and Humanities (DISKAH) network.

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 training is aimed at the DISKAH Fellows’ cohort. You don't need to have any previous knowledge of the tools that will be presented at the workshop.

Where: Macadam 3.1 Innovative Learning Space, Macadam Building, King’s College London, Surrey Street, London, WC2R 2NS. Get directions with OpenStreetMap or Google Maps. What3Words location: ///focal.transit.help.

When: July 3rd, 2025; 11:00-17.00 BST 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. The workshop organizers have checked that:

We are dedicated to providing a positive and accessible learning environment for all. We do not require participants to provide documentation of disabilities or disclose any unnecessary personal information. However, we do want to help create an inclusive, accessible experience for all participants. We encourage you to share any information that would be helpful to make your Carpentries experience accessible. To request an accommodation for this workshop, please fill out the accommodation request form. If you have questions or need assistance with the accommodation form please email us.

Glosario is a multilingual glossary for computing and data science terms. The glossary helps learners attend workshops and use our lessons to make sense of computational and programming jargon written in English by offering it in their native language. Translating data science terms also provides a teaching tool for Carpentries Instructors to reduce barriers for their learners.

Workshop Recordings: Carpentries workshops are designed to be interactive rather than lecture-based, with lessons that build upon one another. To foster a positive online learning environment, we strongly recommend that participants join in real time. As a result, workshop recordings are not recommended and may not be available to learners.

Contact: Please email samantha.finnigan@durham.ac.uk or zeynep.aki@durham.ac.uk 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

We are committed to creating a friendly and respectful place for learning, teaching and contributing for all. All participants in the DH & RSE Summer School are expected to adhere to our Code of Conduct, which is set out as part of our Terms & Conditions.

Everyone who participates in Carpentries activities is also 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

July 3rd, 2025

Start End Length Episode
Before Pre-workshop survey
11:00 11:15 00:15:00 Introduction (15 minutes)
11:15 11:20 00:05:00 1. Automated Version Control
11:20 11:30 00:10:00 2. Setting Up Git
11:30 11:40 00:10:00 3. Creating a Repository
11:40 12:00 00:20:00 4. Tracking Changes
12:00 12:30 00:30:00 5. Exploring History
12:30 13:30 01:00:00 Lunch
13:30 13:40 00:10:00 6. Ignoring Things
13:40 14:25 00:45:00 7. Remotes in GitHub
14:25 15:00 00:35:00 8. Collaborating
15:00 15:30 01:00:00 Afternoon coffee break
15:30 15:45 00:15:00 8. Collaborating (cont'd)
15:45 16:00 00:15:00 9. Conflicts
Extension content:
16:00 16:10 00:10:00 10. Open Science
16:10 16:15 00:05:00 11. Licensing
16:15 16:20 00:05:00 12. Citation
16:20 16:30 00:10:00 13. Hosting
16:30 17:00 00:30:00 Discussion and Questions
After Post-workshop survey

Setup

To participate in a Software Carpentry 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.

The Bash Shell

Bash is a commonly-used shell that gives you the power to do tasks more quickly.

Two options are available for setting up your device so that you’re ready to learn in our workshops with Microsoft Windows.

The first is Windows Subsystem for Linux v2 (“WSL 2”), and the second is Git for Windows (often referred to as “Git Bash”).

Please follow the instructions below, depending on which version of Windows you are using. If unsure, use the asterisk marked version *.

To install WSL 2, you will need Administrator (“admin”) privileges on your laptop/PC.
If you have a device provided by an institution that does not give you admin rights, please either request that they:
  • Give you admin rights (temporarily or otherwise) to install WSL 2 yourself OR
  • Install WSL 2 for you

If you experience any issues, please install Git for Windows using the instructions below.

Windows Version What to Install
Windows 8.1 or earlier Install Git for Windows
Windows 10 (#1902 and below) Install Git for Windows
Windows 10 (#1903 and above) Install WSL 2
Windows 11 * Install WSL 2
Help! What should I use?

Checking your Windows Version

Click on the Windows Start Menu button in the bottom left corner of your screen, or tap the Windows button on your keyboard, and type “System” in the search bar. Click the “System (Control Panel)” option. In the window that opens, there will be information about your current Windows system, including the version. Here is an example from Windows 11:
Windows System Info version example Depending on your version, please go to the relevant instructions below.


Windows XP/Vista/7/8

These versions of Windows are considered End Of Life, and are not recommended for use in modern data science. Software may experience issues, and security updates are also not available which puts your machine at risk. Please consider upgrading your Windows version if you are able to do this yourself, or speak with your local IT administrator to discuss options available to you to upgrade.
If you are running any of these Windows versions, please install Git for Windows using the installation instructions below.


Windows 10 (earlier than version #1903)

For older versions of Windows 10 (version 1903/OS build 18362 and below), please follow the Git for Windows installation instructions below.


Windows 10 (version #1903 and later) and Windows 11

WSL 2 is recommended for more modern versions of Windows as it provides an accurate and representative experience of Linux, but provided from within your Windows environment.

Installing WSL 2

We will install Ubuntu via the Microsoft Store. It is possible to install WSL within the Windows Powershell command prompt, and full instructions are on the Microsoft website.
Note: You will need to restart your computer after installing WSL 2, so make sure you have saved any work.

Why Ubuntu?

Linux comes in many flavours, called “distributions”, and each has its own benefits, features and quirks!

WSL 2 is a fully fledged Linux environment that runs completely within your Windows 10 or 11 operating system. While there are many Linux distributions available to install (e.g. Ubuntu, Debian, Fedora, Mint, Arch, Gentoo, and hundreds more!), WSL 2 only supports a handful of distributions listed above due to the way it needs to be integrated with Windows itself.

So, we will use the default that WSL 2 recommends, Ubuntu.

Via the Microsoft Store:

  1. Open the Windows Start Menu button in the bottom left corner of your screen (four blue squares), or tap the Win Windows button on your keyboard (between the bottom left CTRL and ALT keys) and search “store”. Open the Microsoft Store.
  2. In the Microsoft Store search bar, type “wsl ubuntu”, and select the Ubuntu 22.04 or 24.04 option (at the time of writing, Ubuntu 22.04.06 LTS, or Ubuntu 24.04.01 LTS):
    • If a pop-up window appears asking if you want to make changes to your device, select “Yes”
    • The install should proceed, and this can take a few minutes depending on your PC performance and internet download speed.
    • Once installed, restart the computer.
  3. Once restarted, reopen the Windows Start Menu button in the bottom left corner of your screen, or tap the Windows button on your keyboard. In the search bar, type either:
    • Ubuntu: selecting Ubuntu 22.04.06 LTS or Ubuntu 24.04.01 LTS from the Start Menu will open the bash prompt directly, or
    • Terminal: this will open a new Windows Terminal window, which will look like a blank black window with a blinking cursor waiting for input. Note: This terminal might default to Powershell, and not Ubuntu. If this is the case, click the down arrow in the Terminal window menu bar at the top, and then click Ubuntu 22.04 or 24.04, depending on the version you installed. It will also show keyboard shortcuts (e.g. Ctrl+Shift+1) to open the various prompts available within the Terminal application.
  4. Follow the Installing software within WSL 2 section below.

Installing software within WSL 2

Once you have installed WSL 2, you will need to install some software within the Ubuntu operating system in order to use it effectively. Make sure you are using Ubuntu by checking you see the bash prompt: Ubuntu terminal running bash and showing the Ubuntu version

The first thing to do is to update the list of available Ubuntu software packages, using a tool called apt. Type the following command into the bash prompt: sudo apt update

Note: You will be prompted to enter your password. This is the password you set when installing Ubuntu, and will not show up on the screen as you type it in. This is a security feature of the terminal, and is normal behaviour.

Install updated versions of the base packages required across all our lessons, by typing:

  • sudo apt install git build-essential autotools python3 r-base

You're all set!

If you get stuck, please contact your workshop organisers to get assistance before the workshop starts.

Installing Git for Windows

If you are unable to use WSL 2, please use the following instructions to install Git for Windows (“Git Bash”).

  1. Download the Git for Windows installer.
  2. Run the installer and follow the steps below:
    1. Click on "Next" four times (two times if you've previously installed Git). You don't need to change anything in the Information, location, components, and start menu screens.
    2. From the dropdown menu, "Choosing the default editor used by Git", select "Use the Nano editor by default" (NOTE: you will need to scroll up to find it) and click on "Next".
    3. On the page that says "Adjusting the name of the initial branch in new repositories", ensure that "Let Git decide" is selected. This will ensure the highest level of compatibility for our lessons.
    4. Ensure that "Git from the command line and also from 3rd-party software" is selected and click on "Next". (If you don't do this Git Bash will not work properly, requiring you to remove the Git Bash installation, re-run the installer and to select the "Git from the command line and also from 3rd-party software" option.)
    5. Select "Use bundled OpenSSH".
    6. Ensure that "Use the native Windows Secure Channel Library" is selected and click on "Next".
    7. Ensure that "Checkout Windows-style, commit Unix-style line endings" is selected and click on "Next".
    8. Ensure that "Use Windows' default console window" is selected and click on "Next".
    9. Ensure that "Default (fast-forward or merge) is selected and click "Next"
    10. Ensure that "Git Credential Manager" is selected and click on "Next".
    11. Ensure that "Enable file system caching" is selected and click on "Next".
    12. Click on "Install".
    13. Click on "Finish" or "Next".
  3. If your "HOME" environment variable is not set (or you don't know what this is):
    1. Open command prompt (Open Start Menu then type cmd and press Enter)
    2. Type the following line into the command prompt window exactly as shown:

      setx HOME "%USERPROFILE%"

    3. Press Enter, you should see SUCCESS: Specified value was saved.
    4. Quit command prompt by typing exit then pressing Enter

This will provide you with both Git and Bash in the Git Bash program.

Video Tutorial

The default shell in Mac OS X Ventura and newer versions is Zsh, but Bash is available in all versions, so no need to install anything. You access Bash from the Terminal (found in /Applications/Utilities). See the Git installation video tutorial for an example on how to open the Terminal. You may want to keep Terminal in your dock for this workshop.

To see if your default shell is Bash type echo $SHELL in Terminal and press the Return key. If the message printed does not end with '/bash' then your default is something else, you can change your current shell to Bash by typing bash and then pressing Return. To check your current shell type echo $0 and press Return.

To change your default shell to Bash type chsh -s /bin/bash and press the Return key, then reboot for the change to take effect. To change your default back to Zsh, type chsh -s /bin/zsh, press the Return key and reboot. To check available shells, type cat /etc/shells.

The default shell is usually Bash and there is usually no need to install anything.

To see if your default shell is Bash type echo $SHELL in Terminal and press the Return key. If the message printed does not end with '/bash' then your default is something else, you can change your current shell to Bash by typing bash and then pressing Return. To check your current shell type echo $0 and press Return.

To change your default shell to Bash type chsh -s /bin/bash and press the Return key, then reboot for the change to take effect. To change your default back to Zsh, type chsh -s /bin/zsh, press the Return key and reboot. To check available shells, type cat /etc/shells.


Note for Windows Users

Git

Git is a version control system that lets you track who made changes to what when and has options for easily updating a shared or public version of your code on github.com. You will need a supported web browser.

You will need an account at github.com for parts of the Git lesson. Basic GitHub accounts are free. We encourage you to create a GitHub account if you don't have one already. Please consider what personal information you'd like to reveal. For example, you may want to review these instructions for keeping your email address private provided at GitHub.

Please open the Terminal app, type git --version and press Enter/Return. If it's not installed already, follow the instructions to Install the "command line developer tools". Do not click "Get Xcode", because that will take too long and is not necessary for our Git lesson. After installing these tools, there won't be anything in your /Applications folder, as they and Git are command line programs. For older versions of OS X (10.5-10.8) use the most recent available installer labelled "snow-leopard" available here. (Note: this project is no longer maintained.) Because this installer is not signed by the developer, you may have to right click (control click) on the .pkg file, click Open, and click Open in the pop-up dialog.

If Git is not already available on your machine you can try to install it via your distro's package manager. For Debian/Ubuntu run sudo apt-get install git and for Fedora run sudo dnf install git.

Text Editor

When you're writing code, it's nice to have a text editor that is optimized for writing code, with features like automatic color-coding of key words. The default text editor on macOS and Linux is usually set to Vim, which is not famous for being intuitive. If you accidentally find yourself stuck in it, hit the Esc key, followed by :+q+! (colon, lower-case 'q', exclamation mark), then hitting Return to return to the shell.

nano is a basic editor and the default that instructors use in the workshop. It is installed along with Git.

nano is a basic editor and the default that instructors use in the workshop. See the Git installation video tutorial for an example on how to open nano. It should be pre-installed.

nano is a basic editor and the default that instructors use in the workshop. It should be pre-installed.

Python

Python is a popular language for research computing, and great for general-purpose programming as well. Installing all of its research packages individually can be a bit difficult, so we recommend Conda-forge, an all-in-one installer.

Regardless of how you choose to install it, please make sure you install a Python version >= 3.9 (e.g. 3.11 is fine, 3.6 is not).

We will teach Python using the Jupyter Notebook, a programming environment that runs in a web browser (Jupyter Notebook will be installed by Miniforge). For this to work you will need a reasonably up-to-date browser. The current versions of the Chrome, Safari and Firefox browsers are all supported (some older browsers, including Internet Explorer version 9 and below, are not).

Before you start: Issues relating to OneDrive
OneDrive is used by many institutions to sync your user folder (C:\Users\[your-username]\) within an organisation. It may cause issues with the installation of the Carpentries environment.
If you have OneDrive set up, please ensure that you can access your C:\Users\[your-username]\Downloads folder:

  • Open File Explorer
  • Right click on the "Downloads" folder in the left-hand navigation pane
  • Select "Properties"
  • In the "Location" tab, ensure that the path is set to C:\Users\[your-username]\Downloads
  • OneDrive Downloads Location

If you encounter problems, please contact your IT support team and workshop organisers for assistance before the workshop.
  1. Open https://conda-forge.org/download/ with your web browser.
  2. Download the Miniforge for Windows installer
  3. Double click on the downloaded file (Something like, Minforge3-Windows-x86_64.exe)
    • If you get a "Windows protected your PC" pop-up from Microsoft Defender SmartScreen, click on "More info" and select "Run anyway"
  4. Follow through the installer using all of the defaults for installation except make sure to check Add Miniforge3 to my PATH environment variable.
  5. Then:
    • EITHER:
      • Right click the following link and click "Save link as...": Carpentries environment file
      • Save the file to your C:\Users\[your-username]\Downloads folder.
      • Make sure that the filename is carpentries_environment.yml and the "Save as type" option is set to YML file (*.yml)
        The following steps requires using the Miniforge Prompt command line. If you aren't comfortable doing the installation yourself stop here and request help at the workshop.
    • OR:
      • Open Git Bash
      • cd ~/Downloads
      • curl -L -O https://raw.githubusercontent.com/carpentries/workshop-template/refs/heads/gh-pages/data/carpentries_environment.yml
  6. Open your Start Menu from your taskbar, or use the Win Windows key.
  7. Search for the application "Miniforge Prompt", and click the icon to open it.
    • Once open, ensure the prompt shows your C:\Users\[your-username] folder. If it does, continue to Step 8 below:
      Miniforge Prompt [your-username] as froggleston
      In this case, the prompt shows C:\Users\froggleston. Your username will be different!
    • If it doesn't:
      • Find your username by typing whoami and press Enter
      • Your username will be shown as [machine-name]\[your-username]. You only need the [your-username] part after the slash, i.e. froggleston in this example.
      • Type cd C:\Users\[your-username] and press Enter
      Miniforge Prompt whoami
      • Continue to Step 8 below
    • If you get stuck, please contact your workshop organisers to get assistance before the workshop starts.
  8. In the Miniforge Prompt window, run the following commands:
    • Type cd Downloads and press Enter
    • Type conda env create -f carpentries_environment.yml and press Enter
  9. The installation may take a few minutes depending on your internet connection speed. Once complete, you can close the Miniforge Prompt window.
  1. Open https://conda-forge.org/download/ with your web browser.
  2. Download the appropriate Miniforge installer for macOS
    The following steps require using the shell. If you aren't comfortable doing the installation yourself stop here and request help at the workshop.
  3. Open a terminal window and navigate to the directory where the executable is downloaded (e.g., cd ~/Downloads).
  4. Type
    bash Miniforge3-
    and then press Tab to autocomplete the full file name. The name of file you just downloaded should appear. Press Enter (or Return depending on your keyboard).
  5. Follow the text-only prompts in the terminal. To move through the text, press Spacebar.
    • Type yes and press Enter (or Return) to approve the license.
    • Press Enter (or Return) to approve the default location for the files.
    • Type yes and press Enter (or Return) to prepend Miniforge to your PATH (this makes the Miniforge distribution the default Python).
  6. Then:
    • EITHER:
      • Right click the following link and click "Save link as...": Carpentries environment file
      • Save the file to your Downloads folder.
      • Make sure that the filename is carpentries_environment.yml and the "Save as type" is set to YML file (*.yml)
    • OR :
      • Open your `bash` terminal
      • cd ~/Downloads
      • curl -L -O https://raw.githubusercontent.com/carpentries/workshop-template/refs/heads/gh-pages/data/carpentries_environment.yml
  7. In the terminal, run: conda env create -f ~/Downloads/carpentries_environment.yml
  8. Close the terminal window.
  1. Open https://conda-forge.org/download/ with your web browser.
  2. Download the appropriate Miniforge installer for Linux
    The following steps require using the shell. If you aren't comfortable doing the installation yourself stop here and request help at the workshop.
  3. Open a terminal window and navigate to the directory where the executable is downloaded (e.g., cd ~/Downloads).
  4. Type
    bash Miniforge3-
    and then press Tab to autocomplete the full file name. The name of file you just downloaded should appear. Press Enter (or Return depending on your keyboard).
  5. Follow the text-only prompts in the terminal. To move through the text, press Spacebar.
    • Type yes and press Enter (or Return) to approve the license.
    • Press Enter (or Return) to approve the default location for the files.
    • Type yes and press Enter (or Return) to prepend Miniforge to your PATH (this makes the Miniforge distribution the default Python).
  6. Then:
    • EITHER:
      • Right click the following link and click "Save link as...": Carpentries environment file
      • Save the file to your Downloads folder.
      • Make sure that the filename is carpentries_environment.yml and the "Save as type" is set to YML file (*.yml)
    • OR :
      • Open your terminal
      • cd ~/Downloads
      • curl -L -O https://raw.githubusercontent.com/carpentries/workshop-template/refs/heads/gh-pages/data/carpentries_environment.yml
  7. In the terminal, run: conda env create -f ~/Downloads/carpentries_environment.yml
  8. Close the terminal window.