20110327 git flow

981 views

Published on

Published in: Technology, Health & Medicine
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
981
On SlideShare
0
From Embeds
0
Number of Embeds
2
Actions
Shares
0
Downloads
8
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

20110327 git flow

  1. 1. git flow - Progmatic SCM for Developers Lifu Zhang Elektrobit Wireless(2011), Company Confidental git flow - Progmatic SCM for Developers 1 / 12
  2. 2. Outline1 Outline2 Ideal Git Branching3 Git Flow Brief4 Using Git Flow create new feature branches relase a new version fix bug in released version5 Reference git flow - Progmatic SCM for Developers 2 / 12
  3. 3. Develop with develop branchmaster - softwarereleases, only stablecode permitteddevelop - everycommits, encourgemore commitsTake advantage offrequent commits,while we still couldfind stable code git flow - Progmatic SCM for Developers 3 / 12
  4. 4. Add feature by feature branchDecenteralize theworksFeature could bemerge back intodevelopA feature could beadd in next release git flow - Progmatic SCM for Developers 4 / 12
  5. 5. Develop with develop branchBugs occurseverytimeA hotfix should beapplied to bothdevelop & masterA hotfix could be aminor release aftermerge git flow - Progmatic SCM for Developers 5 / 12
  6. 6. Overview of ideal branching git flow - Progmatic SCM for Developers 6 / 12
  7. 7. gitflow briefGit flow is a module of git, this tool could help us manage code as”A successful Git branching model” it only have 4 commands: git flow init git flow feature git flow release git flow hotfix git flow - Progmatic SCM for Developers 7 / 12
  8. 8. Install gitflowGet Git Flow Code from: https://github.com/nvie/gitflowif you failed at ’git submodule update’ run command in your gitflowsource directory:$sed -i -e ”s:/git:/http:/” ‘grep ’git://’ -lr .‘$sudo make [INSTALL PRFIX=xxx] install git flow - Progmatic SCM for Developers 8 / 12
  9. 9. Create New Feature git flow feature start xxx A lots of commits . . . git flow feature finish xxx (if you forget your feature name, you can run $git flow feature to see it)After a feature finish, it will be merged into ’develop’ git flow - Progmatic SCM for Developers 9 / 12
  10. 10. Start a Release git flow release start x.x.x A lots of comits . . . git flow release finish x.x.xAfter rel finish, changes will be merged both into master anddevelop, and a tag will be created, so the master won’t be aheadof develop git flow - Progmatic SCM for Developers 10 / 12
  11. 11. Fix a BugBugs occurs every time, after release, we could use git flow hotfixto start a bug fix procedure.hotfix will be merged to master and develop, and a tag will begenerated. git flow - Progmatic SCM for Developers 11 / 12
  12. 12. Jeff Kreeftmeijer. Why aren’t You Using git-flow?Git flow official(host by github) git flow - Progmatic SCM for Developers 12 / 12

×