Name: Billy and Eddie's Declassified Git Survival Guide - Billy Lynch, Chainguard & Eddie Zaneski, Defense Unicorns
Start: 2025-06-25T14:10:00-0600
End: 2025-06-25T14:50:00-0600

June 23 - 25, 2025
Denver, Colorado
View More Details & Registration
Note: The schedule is subject to change.

The Sched app allows you to build your schedule but is not a substitute for your event registration. You must be registered for Open Source Summit North America 2025 to participate in the sessions. If you have not registered but would like to join us, please go to the event registration page to purchase a registration.

This schedule is automatically displayed in Mountain Daylight Time (UTC/GMT -6). To see the schedule in your preferred timezone, please select from the drop-down menu to the right, above "Filter by Date."

IMPORTANT NOTE: Timing of sessions and room locations are subject to change.

Wednesday June 25, 2025 2:10pm - 2:50pm MDT

Bluebird Ballroom 3A

Have you ever botched your git repo so badly that you needed to delete it and reclone it? You're not alone!

This talk dives into the dark side of Git - exploring common disasters like accidental force-pushes, tangled merge conflicts, unrelenting rebases, and the dreaded detached HEAD. We'll look at how and why these situations arise, exploring the underlying Git mechanics that got us into the situation and how we can undo or resolve these problems.

You'll come away from this talk with a greater understanding of Git internals, and the knowledge and tools necessary to rescue yourself from any Git workflow gone awry!

Speakers

Billy Lynch

Staff Software Engineer, Chainguard

Billy is a staff software engineer at Chainguard, working on developer tools and securing software supply chains for everyone! He is a contributor and maintainer to the Sigstore, Tekton, and gittuf projects, and is the creator of gitsign. Prior to working at Chainguard, Billy worked... Read More →

Eddie Zaneski

Technical Advisor to the CTO, Defense Unicorns

Eddie lives in Denver, CO with his wife and dog. He loves open source and works on the Kubernetes project. When not hacking on random things you'll most likely find him climbing rocks somewhere.

Wednesday June 25, 2025 2:10pm - 2:50pm MDT
Bluebird Ballroom 3A

Open Source 101

Audience Experience Level Beginner

Open Source Summit North America 2025

Billy Lynch

Eddie Zaneski

Sign up or log in to save this to your schedule, view media, leave feedback and see who's attending!