Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Branch Model

71a2ae84018279b9286caa4922297a6d?s=47 Ryan Lv
August 07, 2014

Git Branch Model

71a2ae84018279b9286caa4922297a6d?s=128

Ryan Lv

August 07, 2014
Tweet

More Decks by Ryan Lv

Other Decks in Programming

Transcript

  1. Git 分⽀支策略 吕⼩小荣

  2. Why • ⼯工作流程 • 参与到开源项⺫⽬目中

  3. 内容 • 最完美(繁琐)的 Branching Model • Github Flow • Boohee

    Flow
  4. 完(繁)美(琐)

  5. • Master • hotfix • develop • feature • release

  6. 两条主线

  7. 如何开发功能

  8. 如何修复 bug

  9. Github Flow

  10. 术语 • fork(not fuck) • pull request

  11. fork

  12. pull request

  13. 区别 • 第⼀一个 Flow 是单个仓库内协作 • 第⼆二个是多个仓库之间的协作

  14. Boohee Style “薄荷的分⽀支管理策略.”

  15. 代码库 • 共享的单仓库 • merge 时需要 pull request • 新⼈人操作要慎重

  16. 分⽀支 • master • feature/ • hotfix/ • deploy (⼤大杂烩,⼩小受,千万别被

    merge)
  17. 部署到 qa • git checkout qa • git merge feature/sms

    • git pull • git push • cap qa deploy
  18. • http://nvie.com/posts/a-successful-git-branching- model/ • http://www.ruanyifeng.com/blog/2012/07/git.html Reference

  19. thanks and return