You already git started. Now... what?

Talk given at RubyConf Argentina 2014. A journey through the four main git workflows.

Transcript

1. You already git started. Now... what?
2. git is simple
3. git can take whichever form you need
4. git can take whichever form you want
5. a journey into git workflows
6. wecode.io Lucas Videla @luke_ar github.com/delucas
7. Setting expectations • git intermediate • some known knowns • 98 slides • 20 minutes • 4 workflows
8. #1 Centralized Workflow
9. At the beginning there was a central repository...
10. and the users cloned it.
11. Whenever someone works, he pushes his changes
12. and everyone syncs again.
13. an example would be handy here
14. master master master # git clone repo_uri # git clone repo_uri
15. master master master # git add # git commit # zz
16. master master master # git add # git commit # git add # git commit
17. master master master # git push # git add # git commit
18. master master master # # git push error: failed to push zz
19. master master master # # git pull ­­rebase zz
20. master master master # # git push zz
21. master master master # git pull # zz
22. Centralized Workflow onboarding local env
23. Centralized Workflow onboarding local env misses some points and it lies!
24. #2 Feature Branch Workflow
25. There is a centralized repo
26. and the many users cloned it.
27. Whenever someone works, he pushes his changes
28. and everyone syncs again.
29. So... what's the difference?
30. the use of branches
31. another example would be handy here
32. master # git clone repo_uri master
33. master # git checkout ­b issue#42 master issue#42
34. master # git add # git commit master issue#42
35. master # git add # git commit master issue#42
36. master # git add # git commit master issue#42
37. master # git push origin issue#42 issue#42 master issue#42
38. master # git clone repo_uri issue#42 master
39. master # git checkout ­b new­login issue#42 master new-login
40. master # (after two commits) issue#42 master new-login
41. master # git push origin new­login issue#42 master new-login new-login
42. master # git checkout master new-login issue#42 master new-login
43. m master # git merge ­­no­ff new­login new-login issue#42 master new-login
44. m master # git push origin master new-login issue#42 master new-login m
45. master # git checkout master new-login issue#42 m master issue#42
46. master # git pull origin master new-login issue#42 m master issue#42 m
47. master # git merge ­­no­ff issue#42 new-login issue#42 m master issue#42 m m
48. master # git push origin master new-login issue#42 m m master issue#42 m m
49. master # git branch ­d issue#42 new-login issue#42 m m master m m
50. master # git push origin :issue#42 new-login m m master m m
51. new-login master # new-login m m master m zz
52. new-login master # git pull origin master new-login m m master m m
53. master # git branch ­d new­login new-login m m master m m
54. master # git push origin :new­login m m master m m
55. Feature Branch Workflow uses branches! safe env does not lie allows pull-requests
56. Feature Branch Workflow uses branches! safe env does not lie allows pull-requests many spurious commits hard to bind with CI
57. #3 Gitflow Workflow
58. more robust
59. more strict
60. relies on CoC nvie.com/posts/a-successful-git-branching-model
61. 2 long-term branches (master, devel) x short-term branches (hotfix-*, issue-*, release)
62. asking for an example? (let's speed up things a little)
63. master devel hotfix release feature-* v0.1 v0.2 v1.0
64. master devel hotfix release feature-* v0.1 v0.2 v1.0
65. master devel hotfix release feature-* v0.1 v0.2 v1.0
66. master devel hotfix release feature-* v0.1 v0.2 v1.0
67. master devel hotfix release feature-* v0.1 v0.2 v1.0
68. master devel hotfix release feature-* v0.1 v0.2 v1.0
69. master devel hotfix release feature-* v0.1 v0.2 v1.0
70. master devel hotfix release feature-* v0.1 v0.2 v1.0
71. master devel hotfix release feature-* v0.1 v0.2 v1.0
72. Gitflow Workflow robust favors stability tools! github.com/nvie/gitflow
73. Gitflow Workflow robust favors stability tools! tedious difficult onboarding github.com/nvie/gitflow
74. #4 Forking Workflow
75. here is a big difference
76. everybody has a remote repo
77. and full access to read and write on it
78. but can just read from other's repo
79. more secure
80. favors collaboration
81. open source
82. how does it work?
83. there is an arbitrarilly privileged repo
84. collaborators clone it into his own machines
85. then push it to their own remote repositories
86. any new work is pushed to own remote repo
87. collaborator files up a pull request !
88. maintainer pulls from collaborator's and reviews
89. if OK, merges and pushes into privileged repo
90. collaborators pull again from the central repo
91. and update their own remote repos
92. and so on...
93. Forking Workflow scalable open source <3
94. Forking Workflow scalable open source <3 another paradigm YAGNI
95. Final Thoughts
96. Forking Workflow Gitflow Workflow Feature Branch Workflow Centralized Workflow svn, onboarding small teams, experiments! careful releases big projects, open source
97. Questions?
98. Thank you! Icons thenounproject.com Thomas Le Bas, James Fenton, ARudmann, Julien Deveaux, Norbert Kucsera and im icons Palette colourlovers.com “cheer up emo kid”, by electrikmonk Fonts fontsquirrel.com and ufonts.com Raleway and Rockwell @luke_ar