Skip to Content
View all events

Git Clinic

Published by O'Reilly Media, Inc.

Intermediate content levelIntermediate

Everything you wanted to know about Git but were afraid to ask

Course outcomes

  • Understand how to solve common problems in Git by looking at real use cases
  • Gain an understanding of core Git concepts such as rebasing, bisecting, remotes, and upstreams/downstreams
  • Learn to merge conflicting code, manage local and remote branches, and rebase confidently

Course description

Join expert Ian Miell for a highly interactive clinic in which you’ll be presented with a series of problems that can arise with Git use (you may already have encountered them). You’ll vote on the ones you’d most like to explore further and over the following three hours, you’ll work through the problems along with Ian. Prepare to deepen your understanding of Git and confidently use it in any context.

What you’ll learn and how you can apply it

  • How to recover your git repos when it seems to be broken. No more 'remove the folder and re-clone' scenarios.
  • Get important information out of your Git repositories through lesser-known commands
  • Core Git concepts: rebasing, bisecting, remotes, upstreams, and downstreams
  • Techniques for merging conflicting code, managing branches, and rebasing with confidence

This live event is for you because...

  • You use Git but sometimes feel out of your depth. Are you confident with the basics but stumble when things get messy—merge conflicts, rebase woes, or mysterious errors? This clinic is designed for developers, engineers, and anyone who wants to tackle real Git problems head-on and strengthen their day-to-day workflow.

Prerequisites

  • Familiarity with Git

Recommended preparation:

Recommended follow-up:

Schedule

The time frames are only estimates and may vary according to how the class is progressing.

Part I (60 minutes)

  • Presentation and workshop: Introduction; Git level setting
  • Git - what is a distributed source control tool?
  • The four phases of Git content
  • How to read Git graphs
  • What is a Git branch?
  • The 'git log' command

Break

Part II (70 minutes)

  • Presentation and workshop: Branching and tagging; remotes and locals
  • Tags vs branches
  • Detached HEADs
  • Fast-forward
  • Merging and conflict management

Break

Part III (50 minutes)

  • Presentation and workshop: Fixing a mess; common confusions
  • The 'git rerere' command
  • Squashing commits
  • Rebases and cherry-picks
  • Cleaning up your Git messes
  • Q&A

Your Instructor

Ian Miell

Ian Miell has over 25 years of experience consulting on, writing, running, architecting, and maintaining software and infrastructure for dozens of businesses from large to small. He’s also the author of Docker in Practice (Manning), Learn Bash the Hard Way (Leanpub) as well as various training courses for O'Reilly Media and others. He now focuses on helping organizations make changes to their tech and management stacks from the bottom up.

linkedinXlinksearch

Skill covered

Git