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
96

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
54
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
地方に住むエンジニアの残酷な現実とキャリア論
Avatar for nakamichi ichimichi
5
1.6k
Result型で“失敗”を型にするPHPコードの書き方
Avatar for Takuma Kajikawa kajitack
5
920
20250704_教育事業におけるアジャイルなデータ基盤構築
Avatar for Uchide Hiroki(ucchi-) hanon52_
5
810
初学者でも今すぐできる、Claude Codeの生産性を10倍上げるTips
Avatar for Oikon s4yuba
16
11k
코딩 에이전트 체크리스트: Claude Code ver.
Avatar for nacyot nacyot
0
610
AI Agent 時代のソフトウェア開発を支える AWS Cloud Development Kit (CDK)
Avatar for Kenji Kono konokenj
2
160
AIともっと楽するE2Eテスト
Avatar for Yohei Maeda myohei
7
2.8k
PicoRuby on Rails
Avatar for makicamel makicamel
2
130
NPOでのDevinの活用
Avatar for みんなのコード codeforeveryone
0
850
AIエージェントはこう育てる - GitHub Copilot Agentとチームの共進化サイクル
Avatar for Akira Kobori koboriakira
0
600
明示と暗黙 ー PHPとGoの インターフェイスの違いを知る
Avatar for shimabox shimabox
2
520
「テストは愚直&&網羅的に書くほどよい」という誤解 / Test Smarter, Not Harder
Avatar for Munetoshi Ishikawa munetoshi
0
180

Featured

See All Featured
What’s in a name? Adding method to the madness
Avatar for Product Marketing Alliance productmarketing
PRO
23
3.5k
It's Worth the Effort
Avatar for 3n 3n
185
28k
Performance Is Good for Brains [We Love Speed 2024]
Avatar for Tammy Everts tammyeverts
10
960
Six Lessons from altMBA
Avatar for Skipper Chong Warson skipperchong
28
3.9k
Faster Mobile Websites
Avatar for Dean Hume deanohume
307
31k
Gamification - CAS2011
Avatar for David Bonilla davidbonilla
81
5.4k
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
1
430
The Web Performance Landscape in 2024 [PerfNow 2024]
Avatar for Tammy Everts tammyeverts
8
690
Agile that works and the tools we love
Avatar for Rasmus Luckow-Nielsen rasmusluckow
329
21k
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
42
7.4k
How STYLIGHT went responsive
Avatar for nonsquared nonsquared
100
5.6k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
126
53k

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