Getting to grips with Git by Pauline Vos
If you're fighting with Git on a regular basis, you might not be using it optimally. This workshop will lay out how to make your life easier only by changing your daily Git usage through atomic commits and other best practices. Next time you're pulling your hair out from rebase hell, remember this workshop.
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. During this day you'll learn when, why, and how to use atomic commits while only minimally affecting your workflow.
Part 1: easing into it
- Git's branch system: what flow do you use?
- What's the difference between merge and rebase?
- Navigate between branches
- Navigate your history
- What are atomic commits?
- What makes a good commit message?
Part 2: the nitty gritty
- Keep your history clean with interactive rebase
- Cherry-pick and rebase other people's changes
- Use reflog to undo mistakes
- Use bisect to find a certain point in history
- Automatically run commands on your commits
- Automate more of your flow with Git hooks
Pauline is a software engineer and speaker currently employed by Werkspot in Amsterdam. She likes good, clean software design and being as efficient (lazy) as possible. Also cocktails, video games and animal memes. She lives in Amsterdam with her cat, Phife Cat, and about three plants.
- Workshop Getting to grips with Git, 31 May 2019, bij TBA, Utrecht