How Effective Teams Use Git

Discover effective Git practices used by high-performing teams in this conference talk. Learn how to elevate your Git skills beyond the basics, focusing on personal workflows and teamwork flows. Explore techniques to enhance comfort and awareness with Git, including advanced diff handling and conflict resolution. Master the art of crafting a meaningful commit history, from correcting good commits to implementing incremental and automated approaches. Dive into branching strategies, understanding the nuances of longrunning and topic branches, and when to use private or public branches. Gain insights on merging techniques, including rebasing and the "Guitar Hero History" approach. Apply these learnings to boost productivity and improve collaboration within your development team.

Intro
The problem with Git
Personal workflows and teamwork flows
Get comfortable
Get aware
Diffsofancy
Whitespace
Conflict handling
Craft your history
Correct good commits
Storing commits
Incremental
Automate
Auto Squash
Branching
Longrunning branches
Topic branches
Types of branches
Private longrunning branches
Longrunning public branches
Branching is cheap
Merging
Rebase
Private Branch
Guitar Hero History
Summary