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
複雑なフォームに立ち向かう Next.js の技術選定
Avatar for Takashi Machinaga macchiitaka
2
240
Deep Dive into Kotlin Flow
Avatar for Matsuda Jumpei jmatsu
1
370
実用的なGOCACHEPROG実装をするために / golang.tokyo #40
Avatar for mazrean mazrean
1
300
アプリの "かわいい" を支えるアニメーションツールRiveについて
Avatar for 上ちょ / uetyo uetyo
0
280
Cache Me If You Can
Avatar for RyuNen344 ryunen344
2
4k
Improving my own Ruby thereafter
Avatar for monochrome sisshiki1969
1
160
スケールする組織の実現に向けた インナーソース育成術 - ISGT2025
Avatar for teamLab teamlab
PRO
2
170
知っているようで知らない"rails new"の世界 / The World of "rails new" You Think You Know but Don't
Avatar for luccafort luccafort
PRO
1
190
AIを活用し、今後に備えるための技術知識 / Basic Knowledge to Utilize AI
Avatar for Naoki Kishida kishida
22
5.9k
HTMLの品質ってなんだっけ？ “HTMLクライテリア”の設計と実践
Avatar for una unachang113
4
2.9k
The Past, Present, and Future of Enterprise Java with ASF in the Middle
Avatar for ivargrimstad ivargrimstad
0
190
Ruby×iOSアプリ開発 ~共に歩んだエコシステムの物語~
Avatar for Tomoki Kobayashi temoki
0
350

Featured

See All Featured
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
36
6.9k
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
96
6.2k
Unsuck your backbone
Avatar for Amy Palamountain ammeep
671
58k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
7
850
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
3
630
The MySQL Ecosystem @ GitHub 2015
Avatar for Sam Lambert samlambert
251
13k
How STYLIGHT went responsive
Avatar for nonsquared nonsquared
100
5.8k
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
615
210k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
Avatar for Chris Coyier chriscoyier
507
140k
Stop Working from a Prison Cell
Avatar for Chris Michel hatefulcrawdad
271
21k
Writing Fast Ruby
Avatar for Erik Berlin sferik
628
62k
A better future with KSS
Avatar for Kyle Neath kneath
239
17k

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