Infect Your Own Zombie Git Army: Presented at ThatConference 2013

Somewhere in 2010, the entire software development community became obsessed with git; was this some kind of zombifying mind control ray, or is there something else going on?

In this session, Cori Drew and Keith Dahlby will talk about their own zombification, while working with teams of the uninfected.

Starting with traditional source control, they will discuss how git is different, how those differences change how work gets done, and how to avoid some of the discomfort they experienced as the infection took hold.

Using a variety of tools, both command-line and GUI, they will demonstrate a number of common scenarios. They will also discuss their experiences with git-tfs and git-svn. Before the session is over, you'll have a good grounding on how to get started with git today.

Transcript

1. Can You Relate? $ git reset hand –HARD Get it? Instead of head! HA HA HA! $ git branch Get it? branch! HAHA HA! Command line tool! AHHHHH! What is WRONG with them!? ZOMBIES! THIS TALK IS FOR YOU
2. Platinum Sponsors Gold Sponsors
4. http://try.github.io
12. http://usergroup.tv/videos/introduction-to-git
22. * =
24. A Jan 1 B Jan 2 A Jan 1 B Jan 2 C Jan 3 D Jan 4 C Jan 3 Jan 4 D
25. Rebase = re + BASE
27. • 101: Add callout to About page – APPROVED! • 103: Update copyright in footer – APPROVED! • 104: Update “What’s New” callout on home page – APPROVED!
28. • 101: Add callout to About page – APPROVED! • 103: Update copyright in footer – APPROVED! • 104: Update “What’s New” callout on home page – APPROVED!
29. Master Commit B Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch Master Commit A
30. Master Commit B Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch r A TempMerge Branch
31. Master Commit B Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch A TempMerge Branch Merge Merge
32. Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch TempMerge Branch Deploy
33. Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch TempMerge Branch Deploy X
34. Master Commit C (Feature 101) Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch Master Commit B
35. Master Commit C (Feature 101) Feature101 Branch Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch Master Commit B
36. Master Commit C (Feature 101) Feature105 Branch Feature103 Branch Feature102 Branch Feature104 Branch Master Commit B aster mmit A
41. http://usergroup.tv/videos/introduction-to-git http://scottr.org/presentations/git-in-5-minutes/ http://git-scm.com/book http://lostechies.com/jimmybogard/2011/09/20/git-workflows-with-git-tfs
42. August 11th – 13th 2014 Same Place, Same Time