Update: Download the slides from this talk
So you've had your Introduction to Git. You may have even forked a repo or two.
And then you started collaborating with another developer, and the whole thing falls part. Merge conflicts, rejected pushes, hurt feelings, dogs and cats living together, mass hysteria!
This session will intermediate use of git for small to medium-sized teams, focusing on productivity and effectiveness at different stages of a project.
- Patches and Pushes and Pull Requets, oh my!
- How Flow Can You Go?
- Not So Fast…Forward!
- Do not freebase when you rebase.
- Visualizing your repo's topology with `git log` and SourceTree.
We're going to open up the terminal window for interactive demos. We're gonna take questions live from the audience. We're gonna change some lives. Let's git it on!