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 making an incomprehensible jumble of your history. This workshop makes a case for atomic commits and how to use them while only minimally affecting your workflow.

During hands-on exercises, you’ll learn how to properly interactively rebase, fix up, reset, bisect, and more. By the end of the workshop, 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 very long way!