Summary and Schedule

Prerequisite

Before joining Advanced Git Version Control, participants should

• know the topics of the Version Control with Git lesson.
• be able to navigate a UNIX shell.
• Have a Git client installed.

Summary

This lesson extends the Software Carpentry’s Version Control with Git.

Callout

🚧 Under Construction 🚧

This lesson is still under construction and may change when the material was used in several workshops—please be patient.

This is a lesson built with [The Carpentries Workbench][workbench].

	Setup Instructions	Download files required for the lesson
Duration: 00h 00m	1. Introduction	What do I do when I need to make complex decisions with my git respository? How do I collaborate on a software project with others?
Duration: 00h 10m	2. Branches	What are branches? How do I view the current branches? How do I manipulate branches?
Duration: 00h 10m	3. Remote Repositories	How do I connect my code to other versions of the it?
Duration: 00h 10m	4. Undoing Changes	How do I undo changes?
Duration: 00h 10m	5. Merging	How do I merge a branch changes?
Duration: 00h 10m	6. Tags	How can I flag a specific state of the project?
Duration: 00h 10m	7. Branching Models	What is a branching model? Why do you need one? What are the most common branching models?
Duration: 00h 10m	8. Forking Workflow	What are the common workflows of the forking branching model?
Duration: 00h 10m	9. Data Science Workflow	What are the common workflows of the Data Science branching model?
Duration: 00h 10m	10. Large Files	Why are (large) binary files a problem in Git? What is Git LFS? What are the problems with Git LFS?
Duration: 00h 10m	11. Undo, Move, Cherrypick	How to undo changes to a repository? How to rename a branch? How to incoproate specific changes in one branch into another?
Duration: 00h 10m	12. Rebase, Squash, Bisect, Patch	What are rebase, squash, bisect and patch?
Duration: 00h 10m	13. Hooks and Actions	How do I automate my work locally? How do I add automations to GitHub?
Duration: 00h 10m	14. Setting up the Command Prompt	How can I visualize Git information at a glance in the command prompt?
Duration: 00h 15m	15. Additional Resources	What didn’t we cover?
Duration: 00h 15m	Finish

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

Installing Git

---

Since several Carpentries lessons rely on Git, please see this section of the workshop template for instructions on installing Git for various operating systems.

• Git installation on Windows
• Git installation on MacOS
• Git installation on Linux

Creating an Account at a Hosting Service

---

You will need an account for GitHub to follow episodes 3 & 8 in this lesson.

GitHub

Gitlab

1. Go to https://github.com and follow the “Sign up” link at the top-right of the window.
2. Follow the instructions to create an account.
3. Verify your email address with GitHub.
4. Configure multifactor authentication (see below).

Multi-factor Authentication

In 2023, GitHub introduced a requirement for all accounts to have multi-factor authentication (2FA) configured for extra security. Several options exist for setting up 2FA, which are summarised here:

1. set up 2FA via text message (list of countries where authentication by SMS is supported), or
2. use a hardware security key like YubiKey or the Google Titan key.

1. If you already use an authenticator app, like Google Authenticator or Duo Mobile on your smartphone for example, add GitHub to that app.
2. If you have access to a smartphone but do not already use an authenticator app, install one and add GitHub to the app.
3. If you do not have access to a smartphone or do not want to install an authenticator app, you have two options:
   1. set up 2FA via text message (list of countries where authentication by SMS is supported), or
   2. use a hardware security key like YubiKey or the Google Titan key.

The GitHub documentation provides more details about configuring 2FA.

1. Go to https://gitlab.com and follow the “Get free trial” link at the top-right
2. Follow the instructions to create an account
3. Verify your email address with Gitlab
4. Configure multifactor authentication (optional—see below)

Multi-factor Authentication

Multifactor authentication is currently not required, but you can set it up to increase security for your account.

Several options exist for setting up 2FA, which are summarised here:

1. If you already use an authenticator app, like Google Authenticator or Duo Mobile on your smartphone for example, add Gitlab to that app.
2. If you have access to a smartphone but do not already use an authenticator app, install one and add Gitlab to that app.
3. If you do not have access to a smartphone or do not want to install an authenticator app, you can use a hardware security key like YubiKey or the Google Titan key.
4. Save the recovery codes and store them in a secure location. You can use them to login and reconfigure should you loose access you to configured second factor.

The Gitlab documentation provides more details about configuring 2FA.

---

Preparing Your Working Directory

---

We’ll do our work in the Desktop folder so make sure you change your working directory to it with:

BASH

$ cd
$ cd Desktop