If you're fighting with Git on a regular basis, you might not be using it optimally. 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 just 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 flow 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 very long way!


Comments are closed.

Nate Finch at 21:02 on 3 Nov 2018

Really great examples and application. Also super helpful resources to follow up on.

Corey Halpin at 06:45 on 4 Nov 2018

The talk made a compelling case for atomic commits, with good examples to illustrate the concept.

Great examples during the talk

Bob Lindner at 16:46 on 5 Nov 2018

Good examples. Enjoyed hearing how others are doing this.

By recommending and describing the merits of one way to use git, the speaker was able to cover many of the basic and intermediate points about git in a natural way that connected the use of several git commands (rather than just listing them and their functions). The speaker also made great use of graphics (e.g. dropping eggs from a building for bi-secting) and pre-recorded demos, for which she gave excellent running commentary, that made following along easy and enjoyable. This was an ideal git talk.