Git Branching
A simple way to get more productivity
Kim Hiếu is an Android & RoR Developer @ Silicon Straits Saigon
Problem
Only use master branch
Problem
No tagging
Conflict @ master branch
One task @ a time
Productivity git branching model
Use two main branch
● master
○ stable code
○ no build & test error

● develop
○ can run c...
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
Discussion
Thanks for attention
Git branching
Upcoming SlideShare
Loading in...5
×

Git branching

457

Published on

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

Published in: Technology
0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
457
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
10
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

Git branching

  1. 1. Git Branching A simple way to get more productivity Kim Hiếu is an Android & RoR Developer @ Silicon Straits Saigon
  2. 2. Problem Only use master branch
  3. 3. Problem No tagging Conflict @ master branch One task @ a time
  4. 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. 5. Productivity git branching model Three supporting branch group ● feature ● release ● hotfix
  6. 6. Begin a feature branch Checkout from develop
  7. 7. Finish a feature branch Merge to develop
  8. 8. Begin a release branch Checkout from develop
  9. 9. Finish a release branch Merge to master
  10. 10. Finish a release branch Merge to develop
  11. 11. Begin a hotfix branch Checkout from develop
  12. 12. Finish a hotfix branch Merge to develop
  13. 13. Finish a hotfix branch Merge to develop
  14. 14. Don’t use fast forward
  15. 15. Smartgit - A java base git client
  16. 16. Smartgit support git-flow
  17. 17. Discussion Thanks for attention
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×