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

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

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. Discussion
Thanks for attention