Git and Gitlab: Advanced

Do you sometimes delete your project just to clone it again? Maybe you had to use Git for a project but never fully understood how to use Git? Then this course gives you everything you need to master merge conflicts and “detached heads” and get you fully started with managing your projects with Git.

Git is a modern version control system that helps you manage your project efficiently: always keep track of who changed what, when, and why, and easily revert changes when needed. It enables backups, collaboration, statistics, and a complete history of your project with a minimal effort.

In this course, the theory behind Git is briefly explained. Step by step, we will show you how to resolve merge conflicts. We present best practices, show how to properly scale your project, and give an overview of Git’s many features. In the end you will have successfully collaborated with other course participants on a small project.

General information

Duration 3 hours
  • Fundamentals of Git (Architectur of Git, Git State Machine, Git vocabulary)
  • Collaboration and Remotes (Locals & Remotes, Sychronisation, Branching, Merge)
  • Handle problems (Merge-Conflicts, detached Heads)
  • Good Practices and Features Overview (Pull requests, Contributing, Rebase)
The participants
  • have visitied the Git-Introduction Course or already have equivalent knowledge.
  • have Git installed on their own computer and have created their own SSH-Key
This course is target towards students and staff of UZH, who already have some experience with Git and want to learn more about the collaboration process with Git.
At the end of the course, the participants are able
  • to understand the architecture and the workflow of git and they are able make decisions on how to manage a repository.
  • to handle merge-conflicts independently and safely to ensure a frictionless development flow.
  • to create their own pull-request and collaborate effectively on a project.
  • to apply good practices in Git to improve organisation and teamwork.
There is a public Git-Repository with the presentation, helpful links and other useful resources. There is also a Git-Cheat-Sheet.
The course consists of a theoretical part introducing the concepts of Git. After every theory chapter there will be a live demo to better grasp the theory. Afterwards participants will engage in a practical session and try out the learn concepts for themselves.
To participate in this course you need to bring your own computer where you already have Git installed.

Dates

Code Referents Dates Available seats Place
HS25-GITB-01 Wasser Ian 20.01.2026 (14:00 - 17:00 o'clock)
10 Universität Zürich Irchel Register