Git for insidrrrs

A basic introduction to Git, intended for designer types. See http://blog.tfnico.com/2012/10/git-for-insidrrrs.html

Transcript

1. Thomas Ferris Nicolaisen @tfnico www.tfnico.com for Insidrrrs
2. Ever heard any of the following quotes in your team?
3. "Hmm, did I do thelatest changes in this design.php, or in that one called design_new.php?"
4. "Can you email me the latest version?"
5. "Oh, crap! We need to get the old version out in production ASAP!"
6. "Oh, crap! I didn't know you were working on that file!"
7. "Which version is live on the website? I'm not sure about that."
8. aka Source Code Management (SCM) aka Version Control System (VCS) Revision control!
9. Versioning: Homegrown /www/index.php /www/gallery.php /www/.old/21.10.2012/index.php /www/.old/21.10.2012/gallery.php /www/.old/21.10.2012/index.php /www/.old/21.10.2012/gallery.php /www/.old.zip
10. Versioning: Git
11. Stop! Demo-time! Go to windows.github.com → Download the Git for Windows → Create repo → Do some commits
12. Homework.. Go to github.com → Sign up for an account → In Github for Windows, sign in → Push repository to Github
13. Versioning: Git It's like a little database in your project folder. Older versions Current files changes
14. "Database" contents Time Who Message SHA 20.10.2012 14:55 John Insert logos 292989b 20.10.2012 15:15 Bob Nicer slide transitions 0f3f801 20.10.2012 16:21 Sarah Use Arial for content 4b7ecac Generated SHAs (checksum of the contents)
15. Collaboration: Homegrown • Zip and email • FTP server with shared files • Dropbox • Shared network drive (Z:\)
16. Collaboration: Git 292989b 0f3f801 4b7ecac Sarah John Bob 292989b 0f3f801 4b7ecac 292989b 0f3f801 4b7ecac
17. Collaboration: Git 5b9e62d 292989b 0f3f801 4b7ecac Sarah John Bob 292989b 0f3f801 4b7ecac 292989b 0f3f801 4b7ecac
18. Collaboration: Git 5b9e62d 292989b 0f3f801 4b7ecac Sarah John Bob 5b9e62d 292989b 0f3f801 4b7ecac 5b9e62d 292989b 0f3f801 4b7ecac
19. Collaboration: Git 5b9e62d 292989b 0f3f801 4b7ecac Sarah John Bob ddbdc5 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 5b9e62d 292989b 0f3f801
20. Collaboration: Git John ddbdc5 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 5b9e62d 292989b 0f3f801 4b7ecac from Bob
21. Collaboration: Git John 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 x11pod0 ddbdc5 There, I fixed it!
22. Collaboration: Git 5b9e62d 292989b 0f3f801 4b7ecac Sarah John Bob 0fe4db2 5b9e62d 292989b 0f3f801 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 x11pod0 ddbdc5
23. Collaboration: Git 5b9e62d 292989b 0f3f801 4b7ecac Sarah John Bob 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 x11pod0 ddbdc5 5b9e62d 292989b 0f3f801 0fe4db2 x11pod0 ddbdc5
24. Collaboration: Git Sarah John Bob 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 x11pod0 ddbdc5 5b9e62d 292989b 0f3f801 0fe4db2 x11pod0 ddbdc5 5b9e62d 292989b 0f3f801 4b7ecac 0fe4db2 x11pod0 ddbdc5
25. Tooling (Windows) Git Extensions Github for Windows SmartGit ($$) TortoiseGit
26. Tooling (Mac) Tower ($$) Github for Mac GitX (L) SmartGit ($$)
27. Tooling (IDE integration) Eclipse: Plugin = EGit IntelliJ IDEA/WebStorm?: Plugin (built-in) Visual Studio: Git Extensions Emacs (magit), Vim (fugitive)
29. Binary files
30. Feature rich/ Learning Curve
32. Getting started
33. Context switching
34. Speed
35. Learn more http://git-scm.com < -- start here. Free book! Roger Dudler's Git guide <- easy guide http://think-like-a-git.net/ <- deeper guide Git Users mailing list <- I'll be there!
36. Thanks for listening! Questions? Thomas Ferris Nicolaisen @tfnico www.tfnico.com
37. Try Git in your browser
38. Centralized vs Distributed
39. Migrate from • Subversion • TFS (git-tf developed by Microsoft!) • CVS • VSS • etc, etc, etc
40. The playing field Centralized Distributed OSS $$$$ (Microsoft)
41. Sources • Dragon • Unicorn