1. My understanding of git
weng.wei@zalora.sg

2. Meta
• No silver bullets

3. Conservation of
Complexity
• “Complexity has to go somewhere.” -
Bjarne Stroustrup
• http://www.johndcook.com/blog/
2009/09/16/conservation-of-complexity/

4. Background
• Git was initially designed and developed by
Linus Torvalds for Linux kernel
development

5. • Linus Torvalds on git
• http://www.youtube.com/watch?
v=4XpnKHJAok8

6. Linus Torvalds
• “Take CVS(Subversion was ‘CVS done
right’) as an example of what not to do; if in
doubt, make the exact opposite decision. ”
• http://en.wikipedia.org/wiki/Git_(software)

7. SVN vs Git
SVN Git
Centralized Distributed
Track files / folders Track Repository
Revision history is sacred Editing history is common(*)
Big Merge/Commit Merge/Commit Early / Fast
About revision About changeset

8. • In order to learn GIT, one must unlearn
SVN.

9. Revision vs ChangeSet
• Japanese addresses: No street names. Block
numbers.
• http://sivers.org/jadr

14. • http://hginit.com
• hg (mercurial) - “easy GIT” with better
windows support

15. Conservation of
Complexity
• Easy GIT?
• Windows?

16. Rebase

21. • http://git-scm.com/book

22. Demo

23. • Yes, git looks good, but SVN is also good
enough.
• We’ve been using SVN for years! We
survive and succeed. Why bother?

24. • "tinker and fix things that aren't broken" -
The greatest geek who ever lived
• http://theoatmeal.com/comics/tesla