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
MUSUBIXとは
Avatar for Hisaho nahisaho
0
130
生成AIを使ったコードレビューで定性的に品質カバー
Avatar for Chiaki Okamoto chiilog
1
250
「ブロックテーマでは再現できない」は本当か？
Avatar for Takashi Kitajima inc2734
0
520
360° Signals in Angular: Signal Forms with SignalStore & Resources @ngLondon 01/2026
Avatar for Manfred Steyer manfredsteyer
PRO
0
120
Grafana：建立系統全知視角的捷徑
Avatar for Blueswen blueswen
0
330
Basic Architectures
Avatar for Denys Poltorak denyspoltorak
0
660
AI時代のキャリアプラン「技術の引力」からの脱出と「問い」へのいざない / tech-gravity
Avatar for MinoDriven minodriven
20
6.8k
AtCoder Conference 2025
Avatar for shindannin shindannin
0
1k
CSC307 Lecture 03
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
1
490
AIで開発はどれくらい加速したのか？AIエージェントによるコード生成を、現場の評価と研究開発の評価の両面からdeep diveしてみる
Avatar for どすこい daisuketakeda
1
970
CSC307 Lecture 01
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
690
SourceGeneratorのススメ
Avatar for tkym htkym
0
190

Featured

See All Featured
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
37
7.1k
The Language of Interfaces
Avatar for Des Traynor destraynor
162
26k
Designing Experiences People Love
Avatar for Jonathan Moore moore
144
24k
Hiding What from Whom? A Critical Review of the History of Programming languages for Music
Avatar for Tomoya Matsuura tomoyanonymous
2
410
The B2B funnel & how to create a winning content strategy
Avatar for Katarina Dahlin katarinadahlin
PRO
0
270
svc-hook: hooking system calls on ARM64 by binary rewriting
Avatar for Akira Moroo retrage
1
97
Building a A Zero-Code AI SEO Workflow
Avatar for Ian Lurie portentint
PRO
0
300
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
Avatar for Stéphanie Walter stephaniewalter
287
14k
The State of eCommerce SEO: How to Win in Today's Products SERPs - #SEOweek
Avatar for Aleyda Solis aleyda
2
9.5k
The untapped power of vector embeddings
Avatar for Frank van Dijk frankvandijk
1
1.6k
A designer walks into a library…
Avatar for Paul Jervis Heath pauljervisheath
210
24k
Lessons Learnt from Crawling 1000+ Websites
Avatar for Charles Meaden charlesmeaden
PRO
1
1.1k

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