Git branching
18
Git Branching A simple way to get more productivity Kim Hiếu is an Android & RoR Developer @ Silicon Straits Saigon
-
Upload
silicon-straits-saigon -
Category
Technology
-
view
435 -
download
0
description
An awesome git branching practice helps you get more productivity. There are two main branches: master and develop branch. And three supporting branches groups are feature, release, hotfix. It helps you avoid headaches and make you happy when coding. From Tran Kim Hieu - Mobile Evangelist of Silicon Straits Saigon. Connect him: http://www.linkedin.com/in/trankimhieu
Transcript of Git branching
Git BranchingA simple way to get more productivityKim Hiếu is an Android & RoR Developer @ Silicon Straits Saigon
Problem
Only use master branch
Problem
No taggingConflict @ master branchOne task @ a time
Productivity git branching model
Use two main branch● master
○ stable code○ no build & test error
● develop○ can run code○ sometime can’t pass test
Productivity git branching model
Three supporting branch group● feature
● release
● hotfix
Begin a feature branch
Checkout from develop
Finish a feature branch
Merge to develop
Begin a release branch
Checkout from develop
Finish a release branch
Merge to master
Finish a release branch
Merge to develop
Begin a hotfix branch
Checkout from develop
Finish a hotfix branch
Merge to develop
Finish a hotfix branch
Merge to develop
Don’t use fast forward
Smartgit - A java base git client
Smartgit support git-flow
Thanks for attention
Discussion
