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
530
Gamification
delucas
1
130
Pedacitos de rubí
delucas
0
78
¿Aún no usás git y GitHub?
delucas
0
51
Desarrollo de Aplicaciones Móviles - Maestría en Informática
delucas
0
140
TDD IRL reloaded
delucas
0
89
Adaptación de una plataforma de e-learning a nuevos entornos
delucas
0
250
TDD IRL
delucas
1
120
Introducción wecode.io
delucas
0
70
Other Decks in Technology
See All in Technology
dbt開発 with Claude Codeのためのガードレール設計
10xinc
2
1.3k
まずはマネコンでちゃちゃっと作ってから、それをCDKにしてみよか。
yamada_r
2
120
会社紹介資料 / Sansan Company Profile
sansan33
PRO
6
380k
OCI Oracle Database Services新機能アップデート(2025/06-2025/08)
oracle4engineer
PRO
0
180
LLM時代のパフォーマンスチューニング:MongoDB運用で試したコンテキスト活用の工夫
ishikawa_pro
0
170
Generative AI Japan 第一回生成AI実践研究会「AI駆動開発の現在地──ブレイクスルーの鍵を握るのはデータ領域」
shisyu_gaku
0
330
Snowflake×dbtを用いたテレシーのデータ基盤のこれまでとこれから
sagara
0
120
AI時代を生き抜くエンジニアキャリアの築き方 (AI-Native 時代、エンジニアという道は 「最大の挑戦の場」となる) / Building an Engineering Career to Thrive in the Age of AI (In the AI-Native Era, the Path of Engineering Becomes the Ultimate Arena of Challenge)
jeongjaesoon
0
250
Autonomous Database - Dedicated 技術詳細 / adb-d_technical_detail_jp
oracle4engineer
PRO
4
10k
未経験者・初心者に贈る!40分でわかるAndroidアプリ開発の今と大事なポイント
operando
6
750
新規プロダクトでプロトタイプから正式リリースまでNext.jsで開発したリアル
kawanoriku0
1
210
品質視点から考える組織デザイン/Organizational Design from Quality
mii3king
0
210
Featured
See All Featured
How GitHub (no longer) Works
holman
315
140k
Side Projects
sachag
455
43k
Being A Developer After 40
akosma
90
590k
Faster Mobile Websites
deanohume
309
31k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
35
3.1k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
48
9.7k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
33
2.4k
Imperfection Machines: The Place of Print at Facebook
scottboms
268
13k
Music & Morning Musume
bryan
46
6.8k
Principles of Awesome APIs and How to Build Them.
keavy
126
17k
Intergalactic Javascript Robots from Outer Space
tanoku
272
27k
Gamification - CAS2011
davidbonilla
81
5.4k
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