Having trouble groking Git? Not sure what the difference between merging and rebasing is? Wondering what you would ever use a "cherry-pick" for? We'll cover these topics and more in this talk, helping attendees get past Git novice and on their way to Git master.

We'll do a short overview of git, then jump into branching strategies, commit amending, stashing, cherry-picking, and yes, merging versus rebasing. Okay, maybe you won't be a guru after one conference session, but attendees will have a better understanding of how to play nicely with others in the same Git repository and how to fix common (and not so common) issues in Git.