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
100
1

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

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コードレビューの導入・運用と AI駆動開発における「AI4QA」の取り組みについて
Avatar for ハゲワシ hagevvashi
0
580
夢の無限スパゲッティ製造機 -実装篇- #phpstudy
Avatar for hideki kinjyo o0h
PRO
0
180
Migration to Signals, Signal Forms, Resource API, and NgRx Signal Store @Angular Days 03/2026 Munich
Avatar for Manfred Steyer manfredsteyer
PRO
0
210
おれのAgentic Coding 2026/03
Avatar for TsukasaSekiguchi tsukasagr
1
120
条件判定に名前、つけてますか？ #phperkaigi #c
Avatar for Hiromi Hishida 77web
2
910
PHP でエミュレータを自作して Ubuntu を動かそう
Avatar for memory m3m0r7
PRO
2
160
GoのDB アクセスにおける 「型安全」と「柔軟性」の両立 - Bob という選択肢
Avatar for tak tak848
0
300
Ruby and LLM Ecosystem 2nd
Avatar for Koichi ITO koic
1
1.4k
事業会社でのセキュリティ長期インターンについて
Avatar for inlet-back masachikaura
0
130
Smarter Angular mit Transformers.js & Prompt API
Avatar for Christian Liebel christianliebel
PRO
1
110
テレメトリーシグナルが導くパフォーマンス最適化 / Performance Optimization Driven by Telemetry Signals
Avatar for shiro seike seike460
PRO
2
200
Nuxt Server Components
Avatar for wattanx wattanx
0
230

Featured

See All Featured
Become a Pro
Avatar for Speaker Deck speakerdeck
PRO
31
5.9k
Test your architecture with Archunit
Avatar for Yoan thirion
1
2.2k
Beyond borders and beyond the search box: How to win the global "messy middle" with AI-driven SEO
Avatar for David Carrasco davidcarrasco
3
98
Mobile First: as difficult as doing things right
Avatar for Swwweet swwweet
225
10k
Art, The Web, and Tiny UX
Avatar for Lynn Fisher lynnandtonic
304
21k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
Avatar for Eileen M. Uchitelle eileencodes
27
3.4k
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
Avatar for Ines Montani inesmontani
PRO
3
2.1k
Music & Morning Musume
Avatar for Bryan Veloso bryan
47
7.1k
Fantastic passwords and where to find them - at NoRuKo
Avatar for Phil Nash philnash
52
3.6k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.6k
Designing Experiences People Love
Avatar for Jonathan Moore moore
143
24k
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
Avatar for Sophie Logan marketingsoph
0
120

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