Effective Git

The Workshop

The goal of the workshop is to provide just enough detail for practical daily use without getting too academic or deep in the weeds.

We focus on real challenges developers face when working with Git, arming them with an understanding of the foundational concepts along with practical guidance for overcoming those challenges.

The workshop is split into several blocks that each include an introductory presentation followed by an exercise to apply the learnings hands-on with the support of our trainers.

#anchorWorkshop Overview

1. 

   Delivery Pipelines

   Highly integrated and automated infrastructure and workflows are the foundation that successful engineering teams excel on and Git is what drives them at their core. We look at branching models, Pull Request based workflows, and reviewing.

2. 

   Git Fundamentals

   Once we understand how Git fits in to the bigger picture, we'll look into how it works at its core and the building blocks it consists of. We cover what blobs, trees and snapshots are to better understand how they represent a repo's history over time.

3. 

   Branching and Merging

   Git makes branching easy and cheap, and working with Git means constantly switching between branches and merging them back together. We look at common branching and merging scenarios to understand what fast-forward merges and 3-way merges are.

4. 

   Rewriting History

   Keeping a clean history and organizing commits in meaningful ways is essential for efficient collaboration on code bases. We cover (interactive) rebasing and rewriting history including squashing, editing and dropping commits.

5. 

   Bisecting

   Sometimes it's hard to find the change that introduced a particular defect. Git Bisect can be of great help in identifying the respective commit. We look at how bisecting works and how it can be used to save a lot of time in common scenarios.

6. 

   Open Q&A

   We reserve some time in the end to discuss your team's specific questions relating to Git or infrastructure, tooling and automation around it.

#anchorCustomized to your team's needs

We're happy to customize the workshop to precisely fit your team's specific needs or challenges. If you have a very specific branching model or infrastructure, or your team frequently struggles with particular aspects of Git, we can adapt the focus of the workshop more towards these aspects—or cover additional topics as necessary.

All content and examples of the workshop are available publicly on GitHub.

#anchorLeads

Chris Manson

Senior Engineering Consultant

Chris has had a long history with version control systems, with his very first Open Source experience being involved in the transition of the massive KDE codebase from CVS to Git. These days Chris is deeply involved in the JAM Stack movement, giving him a new outlet for his love for Git.

Marco Otte-Witte

Founder and Managing Director of simplabs

Marco has worked with many tech teams around the world. He's helped developers to use Git efficiently, establish effective development infrastructure and workflows as well as automation around testing and deployment.