Overview
Explore common Git anti-patterns and learn how to overcome them in this 43-minute Devoxx conference talk by Lemi Orhan Ergin. Discover the power of Git and how it can increase developer productivity when used correctly. Understand the pitfalls of misusing Git commands and how they can lead to uncomfortable situations. Learn about proper branching strategies, merge/rebase techniques, and effective commit practices. Gain insights from Ergin's extensive experience as an Agile Software Craftsman and his work educating developers on Git best practices. Dive into topics such as Git merge, branching, release branching, commit graphs, and the philosophy behind effective Git usage. Master techniques like committing early, pulling, removing, squashing, and pushing to production. Explore advanced concepts including logical grouping, partial adds, commit messages, commit templates, HEAD pointers, conflicts, Git reflogs, and recovering lost code. Walk away with practical knowledge to improve your Git workflow and cultivate a more efficient development culture.
Syllabus
Introduction
How Git works
Git Merge
Branching
Release Branching
Commit Graphs
The Cure
The Philosophy
Commit Early
Pull
Remove
Squash
Push to production
Summary
Cures
Squashing
Commits
Logical Groups
Partial Ad
Commit Messages
Commit Template
Head Pointer
Conflict
Git RefLock
Git Commit ID
Git Lost Code
Conclusion
Taught by
Devoxx