Presentation about version control and Git. Workshop exercises at http://github.com/kuahyeow/git-workshop

1. Code
Management:
Git

2. Thong Kuah
<Thong.Kuah @ gmail.com>

3. A Coders Carol
presents

4. Crash Dummy Coding
http://www.flickr.com/photos/bugbbq/3853099883/sizes/l/

5. New version

10. Here's another change
And another change

11. I prefer the first one

12. http://www.flickr.com/photos/jemimagibbons/3973603289/

13. Hey! Success!
http://www.flickr.com/photos/brajeshwar/378641553/

14. Teamwork ?
http://www.flickr.com/photos/ivanwalsh/3924222303/

15. cat_generator.sh

16. That's mine! Mine!
http://www.flickr.com/photos/9588236@N02/1454642584/sizes/l/

17. I know!
cat_generator.bak
cat_generator.backup_file
cat_gen.do_not_delete
cat_generator.alice.1
cat_generator.bob.2

18. N^2
http://www.flickr.com/photos/seeminglee/2065927225/

19. Marty McFly
http://commons.wikimedia.org/wiki/File:BTTFTimelines.png

20. http://www.flickr.com/photos/flying_cloud/2667225198/sizes/l/

21. http://www.flickr.com/photos/torley/414120961/sizes/o/

22. Fix it.
http://commons.wikimedia.org/wiki/File:Software_spanner.png

23. Who dunnit?
http://www.flickr.com/photos/editor/3577065653/

24. Where's the problem?
http://www.flickr.com/photos/silvery/2414538926/

25. Re-occurences

26. http://www.flickr.com/photos/tveskov/3387394098/sizes/o/

27. So, what do we
need ?

28. http://www.flickr.com/photos/mattwright/1787856/sizes/l/

29. http://www.flickr.com/photos/clintjcl/2784231777/sizes/o/

30. http://commons.wikimedia.org/wiki/File:Arrows-orphan.svg

31. Version Control

32. Version Control
● Storage
● Keeps multiple
versions
● Handles changes from
multiple sources

33. Experiments
Work with others
Run multiple
versions
Deploy to
production
http://en.wikipedia.org/wiki/File:Revision_controlled_project_visualization-2010-24-02.svg

34. Version Control
Basics

35. Basics
●You get code
●You change code
●You share your
changes

36. Basics
●You checkout
●You change code
●You commit

37. Basics
● You checkout

38. Checkout
http://betterexplained.com/articles/a-visual-guide-to-version-control/

39. Basics
●You checkout
●You change code

40. Change code
http://betterexplained.com/articles/a-visual-guide-to-version-control/
...change file...

41. Basics
●You checkout
●You change code
●You commit

42. Commit
http://betterexplained.com/articles/a-visual-guide-to-version-control/

43. Again?

44. Checkout
http://betterexplained.com/articles/a-visual-guide-to-version-control/

45. Change code
http://betterexplained.com/articles/a-visual-guide-to-version-control/
...change file...

46. Commit
http://betterexplained.com/articles/a-visual-guide-to-version-control/

47. Every version is recorded
http://betterexplained.com/articles/a-visual-guide-to-version-control/

48. Every change is recorded
http://betterexplained.com/articles/a-visual-guide-to-version-control/

49. Basics (II)
●Others get your code
●Others change code
●You get new version

50. Basics (II)
●Others checkout
●Others change code
●You update

51. Basics (II)
●Others checkout
●Others change code
●You update
●And around it goes

52. Sharing is good
http://www.flickr.com/photos/ryanr/142455033/sizes/o/

53. The full picture
Tools
&
Practices

54. Tools
●SVN
●Git
●Mercurial
●etc...

55. Practice is up to you & your team
http://www.flickr.com/photos/st3f4n/3752994778/ http://www.flickr.com/photos/ahnmyrrh/3633346069/

56. Summary
●Version Control is a must
●Use best practice
●Use good tools
●Version control basics

57. Further Information
● http://gitref.org/index.html
● http://progit.org/
● SVN Red Book
● http://betterexplained.com/articles/a-visual-
guide-to-version-control/
● http://www.swc.scipy.org/lec/version.html

58. Credits, Attribution
● http://www.flickr.com/photos/charlieferrari/49323751/sizes/o/
● http://www.flickr.com/photos/nickwheeleroz/2475011402/sizes/l/
● http://www.flickr.com/photos/herzogbr/2123789106/sizes/l/
● http://www.flickr.com/photos/7506006@N07/513417996/in/set-72157600264508078/
● http://www.flickr.com/photos/7506006@N07/513453021/
● http://www.flickr.com/photos/mattwright/1787856/sizes/l/
● http://www.flickr.com/photos/ryanr/142455033/sizes/o/
● http://www.flickr.com/photos/rachelrusinski/533767098/sizes/o/
● http://commons.wikimedia.org
● http://www.flickr.com/photos/missmirr/529688823/sizes/o/

59. Questions?
http://www.flickr.com/photos/gattomimmo/318700028/sizes/o/

60. Git

61. Git
http://progit.org/book/ch1-3.html

62. Workshop time
Ask lots of questions

63. http://github.com/
kuahyeow/git-
workshop