Collaborative version control with Git and GitLab

Wageningen Economic Research

December 09, 2024

10:00 - 17:00 CET

Instructors: Sven van der Burg, Lucas Esclapez

Helpers: Willem-Jan van Zeist, Heleen Bartelings

General Information

This workshop introduces version control with git and teaches you how to collaborate using git and GitLab.

Knowing how to use git and GitLab will allow you to keep track of changes in your software project, publish your code online and collaborate with several people in the same project.

Specifically, this workshop will teach you good practices for collaboration that you will need while working on MAGNET.

Where: Wageningen Economic Research room 'City', WTC den Haag, Pr. Beatrixlaan 582 - 528, 2595 BM Den Haag. Get directions with OpenStreetMap or Google Maps.

When: December 09, 2024, 10:00 - 17:00 CET.

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:

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.

Workshop files: You will find all slides, notebooks, archived collaborative documents, and other relevant files in the files folder of the workshop website repository after the workshop.

Contact: Please email or training@esciencecenter.nl for more information.


Code of Conduct

Participants are expected to follow these guidelines:

Syllabus

Introduction to version control with Git

Collaboration with Git and GitLab

Schedule

Day 1

09:45 Walk-in with coffee and cookies
10:00 Welcome and icebreaker
10:00 Workshop introduction
10:30 Introduction to Git, setting up Git
10:45 Creating a repository, tracking changes.
11:00 Coffee break
11:15 Exploring history, ignoring things
12:00 Remotes in GitLab
12:30 Lunch Break
13:30 Collaboration with Git and GitLab: The git workflow
15:15 Coffee break
15:30 Good practices for collaboration @MAGNET
16:45 Wrap-up
17:00 Drinks and dinner @Minglemush (at own cost)

All times in the schedule are in the CET timezone.


Setup

To participate in this 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.

Software setup

Computer

Participants must work on a computer with a Mac, Linux, or Windows operating system (not a tablet, Chromebook, etc.). If you normally work in a remote environment, please follow below setup instructions in the remote environment.

Software

To participate in this workshop, you will need to prepare the following (if you haven’t already):

To confirm that everything works

You should now be able to open a terminal window and execute the following commands:

Git

git --version

returning (something similar to):

git version 2.37.1 (Apple Git-137.1)

If something does not work:

Follow the corresponding setup instructions. There will be a check-in session the week before the workshop where you can ask questions regarding the setup. If you still need help, send us an email at training@esciencecenter.nl.