Great session! The allotted time was not enough (not your fault!). The flow charts you presented were pretty confusing. I could see a git newbie getting scared. I'd try to use a workflow graphic that is more similar to the second diagram on http://hades.name/blog/2010/01/22/git-your-friend-not-foe-vol-2-branches/
Great session! I'm a features veteran and learned some great best practices. I'd probably cut down on the rehash and maybe show screenshots of the original problems you are addressing (like show a screenshot feature conflict) and screenshots of a well laid out features UI page.
Been using Git for years and learned some new things! Thanks!
I enjoyed this presentation. For a beginner, it was great at showing how to structure workflow and use the resources available.