The best practice to mange git branch

1. ThoQ Luong
SILILAB Vietnam
Hanoi, March 11, 2014
Rubichat

2. Outline
2
1. Branch classification
2. Apply branch model into Rubichat
3. FAQ
4. Demo
5. Reference

3. Branch classification
3
 Classify branches into 02 categories:
 Main branches:
origin/master
origin/develop
 Supporting branches:
 Feature branches
 Release branches
 Hotfix branches

4. Feature branches
4
 May branch off from: develop
 Must merge back into: develop
 Naming convention: anything except master,
develop, release-* or hotfix-*
 Should delete after finishing feature development

5. Release branches
5
 May branch off from: develop
 Must merge back into: develop and master
 Naming convention: release-*
 Must be tagged into master after merging
 Example: change master version from 0.2  0.3
 Should delete after finishing feature development

6. Hotfix branches
6
 May branch off from: master
 Must merge back into: develop and master
 Naming convention: hotfix-*
 Must be tagged into master after merging
 Example: change master version from 0.2.1  0.2.2
 Should delete after finishing feature development

7. 7

8. Apply branch model into Rubichat
8
 Outline rubichat versions:
 Version: 0.6: rubichat works well in giaybac.com
 Version: 0.8: rubichat admin, branch off from 0.6
 Version: 0.9: rubichat system, branch off from 0.8
 Version: 1.0: merge 0.6 and 0.9
 Rubiweb will be developed in branch
“origin/develop”
 Feature upgrade will be developed in a feature
branch. Example: move data from Redis to
MongoDb

9. Smartgit common actions:
9
 Commit
 Pull
 Push
 Switch branch

10. Smartgit important actions:
10
 Branch off from a specific branch:

11. Smartgit important actions:
11
 Merge branches

12. FAQ
12
1. How to discard a pull that causes my current
development progress crash?
 Ask developer to reverse his push and re-pull

13. 13
Demo:
1. Feature branch
2. Reverse a merge

14. Reference
14
 A successful Git branching model
http://nvie.com/posts/a-successful-git-branching-
model/ (cited by lots of posts)

15. Thank you!
15