1. Stop using git like
subversion
Ben Scheirman

2. what scm tool are
you using?

3. what scm tool are
you using?
Subversion? TFS? VSS?
CVS? Perforce?
MKS?
FSA? git? hg?

4. stop me if this sounds
familiar

5. Server
Fred Amy

6. Server
Fred Amy

7. Server
Fred Amy

8. Server
Fred Amy

9. Server
Fred Amy

10. Server
Fred Amy

11. Server
Fred Amy

12. Drawbacks of Subversion

13. Enter the distributed
model...

14. Distributed

15. Git Demo
* initialization
* staging files
* committing
* remotes
* push / pull

16. Branching

17. Branching
Don't believe the
FUD....branching is EASY

18. Branching is
lightweight

19. Branching is
lightweight

20. Branching is
lightweight

21. Branching is
lightweight

22. Branching is
lightweight

23. Merge vs Rebase

24. Merge vs Rebase
Merge

25. Merge vs Rebase
Merge
Rebase

26. Never rebase a public
branch

27. Git Demo
* branch
* merge
*rebase

29. Feature Branches
a.k.a "topic" branches

30. Merge (no fast-

31. Hotfixes

33. Contributing to open source
Fork & Clone the project
$ git clone git@github.com/username/project.git
Add a remote called "ypstream"
$ git remote add upstream http://github.com/user/
project.git

34. Thank You
http://nvie.com/posts/a-successful-git-branching-model/