Intermediate Topics in Version Control with GitCompact course: Intermediate Topics in Version Control with Git


This is a half day course.


Prior knowledge about version control with Git is required. This can e.g. be acquired by attending the SSC’s introductory course “Version Control with Git”. This course is intended for all scientific audiences. Participants are required to bring their own laptops to work on during the course. Network access (e.g. through Eduroam) is recommended.


Applying version control can be a game changer for a collaborative research software project. However, even in projects that already successfully use Git, there is often room for improvement of the employed Git workflows. This workshop tries to delve into collaborative workflows using Git branches and discuss their strengths. Special emphasis is given to the resolution of merge conflicts that may be required in the process of dealing with diverging branches.

Learning Objectives

After the course participants will

  • Understand git branches and typical workflows using them
  • Have seen collaborative workflows on GitHub (Pull Requests, Forks etc.)
  • Gained first experience in resolving merge conflicts
  • Know how to use rebase to clean up a branch’s history


There is an instance of this course scheduled: Signup for the next scheduled course