Getting to Grips with Git

Pauline Vos

Pauline Vos

@vanamerongen

Abstract

Many Git users tend to use Git as a save point, like in a video game; chronologically making checkpoint commits as they go. This spreads out changes to the same areas in the code over several commits, necessitates merging and resolving conflicts, and generally makes an incomprehensible jumble of your history. This talk makes a case for atomic commits and how to use them while only minimally affecting your workflow.

Using pre-recorded demos, you’ll learn how to properly interactively rebase, fix up, reset, bisect, and more. By the end of the talk, you’ll have seen how this Git workflow will make your life easier and how it will affect your ability to cherry pick, drop unwanted commits, and most importantly: not spend hours resolving conflicts in rebase hell. A little change in habits can go a long way!

Biography

Pauline is a PHP developer from Amsterdam currently employed by Werkspot. She likes good, clean software design and being as efficient (lazy) as possible. Also cocktails, video games and animal memes. She lives in the South of France with her cat, Phife Cat, and about three plants.