Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Branching

Avatar for Trần Kim Hiếu Trần Kim Hiếu
October 18, 2013
Programming
1
99

Git Branching

A awesome git branching model help you get more productivity at work

Avatar for Trần Kim Hiếu

Trần Kim Hiếu

October 18, 2013
Tweet

More Decks by Trần Kim Hiếu

See All by Trần Kim Hiếu
10 keys to effective learning new things
Avatar for Trần Kim Hiếu trankimhieu
1
58
10 keys to learning new technology
Avatar for Trần Kim Hiếu trankimhieu
2
130
Elasticsearch - Why big system need you
Avatar for Trần Kim Hiếu trankimhieu
2
9.5k
Cloud Computing - Some "keyword" must know
Avatar for Trần Kim Hiếu trankimhieu
0
7.4k

Other Decks in Programming

See All in Programming
AI前提で考えるiOSアプリのモダナイズ設計
Avatar for 野瀬田　裕樹 yuukiw00w
0
220
ぼくの開発環境2026
Avatar for yuzneri yuzneri
0
190
Data-Centric Kaggle
Avatar for ねぼすけAI isax1015
2
770
AIエージェント、”どう作るか”で差は出るか？ / AI Agents: Does the "How" Make a Difference?
Avatar for r-kagaya rkaga
4
2k
0→1 フロントエンド開発 Tips🚀 #レバテックMeetup
Avatar for 弁護士ドットコム bengo4com
0
560
AI Agent の開発と運用を支える Durable Execution #AgentsInProd
Avatar for izumin5210 izumin5210
7
2.3k
CSC307 Lecture 07
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
550
[KNOTS 2026登壇資料]AIで拡張‧交差する プロダクト開発のプロセス および携わるメンバーの役割
Avatar for hisatake hisatake
0
270
副作用をどこに置くか問題：オブジェクト指向で整理する設計判断ツリー
Avatar for Koya Masuda koxya
1
610
AI巻き込み型コードレビューのススメ
Avatar for Nealle nealle
1
160
FOSDEM 2026: STUNMESH-go: Building P2P WireGuard Mesh Without Self-Hosted Infrastructure
Avatar for Date Huang tjjh89017
0
160
カスタマーサクセス業務を変革したヘルススコアの実現と学び
Avatar for Tomoyuki Hamaguchi _hummer0724
0
690

Featured

See All Featured
Fireside Chat
Avatar for paigeccino paigeccino
41
3.8k
GraphQLとの向き合い方2022年版
Avatar for Yosuke Kurami quramy
50
14k
The untapped power of vector embeddings
Avatar for Frank van Dijk frankvandijk
1
1.6k
Testing 201, or: Great Expectations
Avatar for Joseph Mastey jmmastey
46
8k
JAMstack: Web Apps at Ludicrous Speed - All Things Open 2022
Avatar for David Neal reverentgeek
1
330
Collaborative Software Design: How to facilitate domain modelling decisions
Avatar for Kenny Baas-Schwegler baasie
0
140
Have SEOs Ruined the Internet? - User Awareness of SEO in 2025
Avatar for Akash Hashmi akashhashmi
0
270
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
5
880
Let's Do A Bunch of Simple Stuff to Make Websites Faster
Avatar for Chris Coyier chriscoyier
508
140k
Navigating the moral maze — ethical principles for Al-driven product design
Avatar for Skipper Chong Warson skipperchong
2
240
jQuery: Nuts, Bolts and Bling
Avatar for Doug Neiner dougneiner
65
8.4k
Leveraging Curiosity to Care for An Aging Population
Avatar for Cassini Nazir cassininazir
1
160

Transcript

  1. Git Branching A simple way to get more productivity Kim

    Hiếu is an Android & RoR Developer @ Silicon Straits Saigon

  2. Problem Only use master branch

  3. Problem No tagging Conflict @ master branch One task @

    a time

  4. Productivity git branching model Use two main branch • master

    ◦ stable code ◦ no build & test error • develop ◦ can run code ◦ sometime can’t pass test

  5. Productivity git branching model Three supporting branch group • feature

    • release • hotfix
  6. None

  7. Begin a feature branch Checkout from develop

  8. Finish a feature branch Merge to develop

  9. Begin a release branch Checkout from develop

  10. Finish a release branch Merge to master

  11. Finish a release branch Merge to develop

  12. Begin a hotfix branch Checkout from develop

  13. Finish a hotfix branch Merge to develop

  14. Finish a hotfix branch Merge to develop

  15. Don’t use fast forward

  16. Smartgit - A java base git client

  17. Smartgit support git-flow

  18. Thanks for attention Discussion