Building a Better Web
June 19–20, 2017: Training
June 20–22, 2017: Tutorials & Conference
San Jose, CA

Getting out of your Git messes

9:50am–10:30am Wednesday, June 21, 2017
Frontend Tools
Location: 210 AE
Secondary topics:  Tools
Average rating: ****.
(4.50, 10 ratings)

Who is this presentation for?

  • Anyone who uses Git and wants to learn more about it

Prerequisite knowledge

  • Experience using Git and the Git CLI

What you'll learn

  • Understand Git's fundamental structures
  • Learn how to avoid making a mess in Git, from best practices and workflows to adopt to tools to use
  • Learn how to recover when you make a mistake


Git, the widely popular version control tool that just about everyone who works on the web seems to use, is powerful, scalable, flexible. . .and difficult to learn. If you’ve used Git for any amount of time, you’ve probably gotten yourself into some confusing, frustrating, or downright terrifying situations. But don’t panic. You are not alone. Katie Sylor-Miller explains how to avoid getting into Git messes in the first place, demonstrating how the fundamental structures in Git actually work under the hood and sharing best practices, workflows, and tools that will keep your commits in order and reduce the panic caused by merge conflicts. Katie then shows you how to leverage Git’s powerful features to save yourself when everything seems to go wrong.

Photo of Katie Sylor-Miller

Katie Sylor-Miller


Katie Sylor-Miller is a staff software engineer on the frontend systems team at Etsy, where she advocates for and implements frontend best practices in collaboration with product engineers and designers. She is passionate about frontend architecture, design systems, style guides, accessibility, performance, and teaching others. Katie has written about the engineering side of design systems for the Design Systems Handbook, and she created to share her hard-won knowledge of how to get out of your Git messes with a bit of humor (and a lot of swears).

Comments on this page are now closed.


Picture of Tom Green
06/21/2017 3:40am PDT

Excellent presentation. I know GIT pretty well from a user perspective, but you gave me a better understanding of how it works under the hood.