StrangeLoop 2013

1. Wednesday, September 18, 13

2. Wednesday, September 18, 13

3. @jessitron
http://gitworkshop.jessitron.com
Wednesday, September 18, 13

4. Wednesday, September 18, 13

5. Git, Illuminated
workflows | ++
Wednesday, September 18, 13

6. svn
start from a straight line
Wednesday, September 18, 13

7. git
accept reality
even if you work on master,
it’s a branch of origin/master
Wednesday, September 18, 13

8. How does your story look?
git-svn git-flow github
Wednesday, September 18, 13

9. git-svn
the illusion of straight-line
development
Local work is squashed or rebased onto master
Wednesday, September 18, 13

10. or display reality
work that took place in parallel is
recorded in parallel
Wednesday, September 18, 13

11. git-svn
rebase to bring in work
Wednesday, September 18, 13

12. git-svn
rebase to bring in work
Wednesday, September 18, 13

13. git-svn
rebase to bring in work
Wednesday, September 18, 13

14. or display reality
Wednesday, September 18, 13

15. or display reality
Wednesday, September 18, 13

16. or display reality
Wednesday, September 18, 13

17. Which branch is for working?
git-flow
Wednesday, September 18, 13

18. git-flow
master is for releases
v2.0
v2.1
Wednesday, September 18, 13

19. git-flow
master is for releases
v2.0
v2.1
Wednesday, September 18, 13

20. git-flow
develop is for progress
v2.0
v2.1
Wednesday, September 18, 13

21. git-flow
features are for work
v2.0
v2.1
feature/ponies
Wednesday, September 18, 13

22. git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13

23. git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13

24. git-flow
releases are for testing
v2.0
release/v2.1
Wednesday, September 18, 13

25. git-flow
releases are for testing
v2.0
release/v2.1
Wednesday, September 18, 13

26. git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13

27. git-flow
hotfixes are for fixing
v2.0
v2.1
v2.0.1
Wednesday, September 18, 13

28. Who decides when it’s ready?
github
Wednesday, September 18, 13

29. github
author != committer
Wednesday, September 18, 13

30. github
author != committer
Wednesday, September 18, 13

31. github
author != committer
Wednesday, September 18, 13

32. github
author != committer
Wednesday, September 18, 13

33. github
fork
Wednesday, September 18, 13

34. github
fork
Wednesday, September 18, 13

35. github local
fork clone
Wednesday, September 18, 13

36. github local
Wednesday, September 18, 13

37. github local
Wednesday, September 18, 13

38. github local
push
Wednesday, September 18, 13

39. github local
push
Wednesday, September 18, 13

40. github local
push
Wednesday, September 18, 13

41. github local
push
Wednesday, September 18, 13

42. github local
push
pull
request
Wednesday, September 18, 13

43. github local
Wednesday, September 18, 13

44. choose the shape of your history
choose your level of reality
choose tightness of control
Your story is what you make it.
Wednesday, September 18, 13

45. Wednesday, September 18, 13