Back to proposals-2013
Title: Git - Everyday recipes for you and your team
Proposer: charles_bailey
Type: Presentation
Duration: 90 minutes
Description:
Git is a very powerful and flexible distributed version control tool. Because it
is so flexible, it provides very little implicit guidance on how best to benefit
from its power. This talk aims to show you how to look at problems from the Git
perspective and how to use and develop optimal recipes for common situations
which you encounter in your workflow.
We start with a brief overview of Git concepts and the logical structure of a
Git repository. Using this knowledge, we look at the effect of common Git
operations on its logical data model.
Building on this understanding, we explore practical ways in which we can use
Git as a programmer's “multi-tool” to improve our individual and team
productivity.
Situations that we will look at will include:
- Rebasing with minimal touched files to improve incremental build performance.
- Keeping private branches up to date with minimal merge “noise”.
- Practical techniques for big complex merges: how to make sure you don't miss anything and how to make sure you don't erroneously undo anything.
- Strategies for avoiding big complex merges.
- Undoing bad commits; undoing bad merges; re-doing previously undone commits.
- How to find stuff that you're sure you had but can't find anywhere.
Roger: we've got 3 on git - I think we want 1 and (possibly) 2. I prefer this one to “Why should I care about the index”; but it looks like a close match to “The Git Parable”