Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
You already git started. Now... what?
Search
delucas
October 24, 2014
Technology
3
140
You already git started. Now... what?
Talk given at RubyConf Argentina 2014. A journey through the four main git workflows.
delucas
October 24, 2014
Tweet
Share
More Decks by delucas
See All by delucas
TBD - Too Busy Disorder
delucas
0
520
Gamification
delucas
1
120
Pedacitos de rubí
delucas
0
76
¿Aún no usás git y GitHub?
delucas
0
48
Desarrollo de Aplicaciones Móviles - Maestría en Informática
delucas
0
140
TDD IRL reloaded
delucas
0
86
Adaptación de una plataforma de e-learning a nuevos entornos
delucas
0
230
TDD IRL
delucas
1
110
Introducción wecode.io
delucas
0
70
Other Decks in Technology
See All in Technology
Oracle Base Database Service 技術詳細
oracle4engineer
PRO
6
57k
MC906491 を見据えた Microsoft Entra Connect アップグレード対応
tamaiyutaro
1
520
バックエンドエンジニアのためのフロントエンド入門 #devsumiC
panda_program
16
7k
技術負債の「予兆検知」と「状況異変」のススメ / Technology Dept
i35_267
1
1k
プロセス改善による品質向上事例
tomasagi
2
2.2k
AndroidXR 開発ツールごとの できることできないこと
donabe3
0
120
Platform Engineeringは自由のめまい
nwiizo
4
2k
リアルタイム分析データベースで実現する SQLベースのオブザーバビリティ
mikimatsumoto
0
1.2k
モノレポ開発のエラー、誰が見る?Datadog で実現する適切なトリアージとエスカレーション
biwashi
6
790
N=1から解き明かすAWS ソリューションアーキテクトの魅力
kiiwami
0
110
目の前の仕事と向き合うことで成長できる - 仕事とスキルを広げる / Every little bit counts
soudai
24
6.6k
室長と気ままに学ぶマイクロソフトのビジネスアプリケーションとビジネスプロセス
ryoheig0405
0
350
Featured
See All Featured
Product Roadmaps are Hard
iamctodd
PRO
50
11k
10 Git Anti Patterns You Should be Aware of
lemiorhan
PRO
656
59k
Rails Girls Zürich Keynote
gr2m
94
13k
The Language of Interfaces
destraynor
156
24k
Unsuck your backbone
ammeep
669
57k
Adopting Sorbet at Scale
ufuk
74
9.2k
For a Future-Friendly Web
brad_frost
176
9.5k
Site-Speed That Sticks
csswizardry
3
370
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
29
1k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
45
2.3k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
49
2.3k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
27
1.5k
Transcript
You already git started. Now... what?
git is simple
git can take whichever form you need
git can take whichever form you want
a journey into git workflows
wecode.io Lucas Videla @luke_ar github.com/delucas
Setting expectations • git intermediate • some known knowns •
98 slides • 20 minutes • 4 workflows
#1 Centralized Workflow
At the beginning there was a central repository...
and the users cloned it.
Whenever someone works, he pushes his changes
and everyone syncs again.
an example would be handy here
master master master # git clone repo_uri # git clone
repo_uri
master master master # git add # git commit #
zz
master master master # git add # git commit #
git add # git commit
master master master # git push # git add #
git commit
master master master # # git push error: failed to
push zz
master master master # # git pull rebase zz
master master master # # git push zz
master master master # git pull # zz
Centralized Workflow onboarding local env
Centralized Workflow onboarding local env misses some points and it
lies!
#2 Feature Branch Workflow
There is a centralized repo
and the many users cloned it.
Whenever someone works, he pushes his changes
and everyone syncs again.
So... what's the difference?
the use of branches
another example would be handy here
master # git clone repo_uri master
master # git checkout b issue#42 master issue#42
master # git add # git commit master issue#42
master # git add # git commit master issue#42
master # git add # git commit master issue#42
master # git push origin issue#42 issue#42 master issue#42
master # git clone repo_uri issue#42 master
master # git checkout b newlogin issue#42 master new-login
master # (after two commits) issue#42 master new-login
master # git push origin newlogin issue#42 master new-login new-login
master # git checkout master new-login issue#42 master new-login
m master # git merge noff newlogin new-login issue#42 master
new-login
m master # git push origin master new-login issue#42 master
new-login m
master # git checkout master new-login issue#42 m master issue#42
master # git pull origin master new-login issue#42 m master
issue#42 m
master # git merge noff issue#42 new-login issue#42 m master
issue#42 m m
master # git push origin master new-login issue#42 m m
master issue#42 m m
master # git branch d issue#42 new-login issue#42 m m
master m m
master # git push origin :issue#42 new-login m m master
m m
new-login master # new-login m m master m zz
new-login master # git pull origin master new-login m m
master m m
master # git branch d newlogin new-login m m master
m m
master # git push origin :newlogin m m master m
m
Feature Branch Workflow uses branches! safe env does not lie
allows pull-requests
Feature Branch Workflow uses branches! safe env does not lie
allows pull-requests many spurious commits hard to bind with CI
#3 Gitflow Workflow
more robust
more strict
relies on CoC nvie.com/posts/a-successful-git-branching-model
2 long-term branches (master, devel) x short-term branches (hotfix-*, issue-*,
release)
asking for an example? (let's speed up things a little)
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
master devel hotfix release feature-* v0.1 v0.2 v1.0
Gitflow Workflow robust favors stability tools! github.com/nvie/gitflow
Gitflow Workflow robust favors stability tools! tedious difficult onboarding github.com/nvie/gitflow
#4 Forking Workflow
here is a big difference
everybody has a remote repo
and full access to read and write on it
but can just read from other's repo
more secure
favors collaboration
open source
how does it work?
there is an arbitrarilly privileged repo
collaborators clone it into his own machines
then push it to their own remote repositories
any new work is pushed to own remote repo
collaborator files up a pull request !
maintainer pulls from collaborator's and reviews
if OK, merges and pushes into privileged repo
collaborators pull again from the central repo
and update their own remote repos
and so on...
Forking Workflow scalable open source <3
Forking Workflow scalable open source <3 another paradigm YAGNI
Final Thoughts
Forking Workflow Gitflow Workflow Feature Branch Workflow Centralized Workflow svn,
onboarding small teams, experiments! careful releases big projects, open source
Questions?
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