Your SlideShare is downloading. ×
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Git flow
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Git flow

2,829

Published on

珠三角技术沙龙-8月份

珠三角技术沙龙-8月份

0 Comments
8 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
2,829
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
74
Comments
0
Likes
8
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

  • 1. Git Flow Shaokun Wu [email_address]
  • 2. Why Git?
    • 随意的分支 (Branch) 与合并 (Merge)
    • 分布式的、本地的代码库 (Repository)
    • 快捷、轻量
    • 任意的工作流程
    • GitHub
  • 3. 问题呢?
    • 把 Git 当 SVN 用,在 master 分支开发
    • 依然避免 Branch/Merge
    • 任意的工作流程,让人无从下手
    • 依旧习惯集中式版本控制的思维
  • 4. Git Flow - by nvie 一种值得参考的工作流程
  • 5.  
  • 6. 主分支 master, develop
  • 7. master, develop 分支
    • 用途:
      • master HEAD - 正式版
      • develop HEAD - 最新的开发版
      • 当 develop 足够稳定时候,将合并到 master ,并且 tag 上发布版本号
    • 存在周期:
      • 永远存在
  • 8. 辅助分支 feature, release, hotfix
  • 9. feature 分支
    • 必须遵循:
      • 从 develop 分支
      • 合并回 develop
      • 任意命名,除了 master, develop, release-*, hotfix-*
    • 用途:
      • 用于开发新的功能特性 (feature)
    • 存在周期:
      • 合并到 develop 后删除
  • 10.  
  • 11. release 分支
    • 必须遵循:
      • 从 develop 分支
      • 合并回 develop, master
      • 命名为 release-*
    • 用途:
      • 为最终正式版做准备
      • 提交 (commit) 小的 bug fix
    • 存在周期:
      • 合并到 develop 后删除
  • 12. hotfix 分支
    • 必须遵循:
      • 从 master 分支
      • 合并回 develop, master
      • 命名为 hotfix-*
    • 用途:
      • 同样为最终正式版做准备
      • 提交 (commit) 小的 bug fix
      • 正式版发生重大的错误,必须立刻修复
    • 存在周期:
      • 合并到 develop/release 后删除
  • 13. gitflow
  • 14. $ git flow init No branches exist yet. Base branches must be created now. Branch name for production releases: [master] Branch name for "next release" development: [develop] How to name your supporting branch prefixes? Feature branches? [feature/] Release branches? [release/] Hotfix branches? [hotfix/] Support branches? [support/] Version tag prefix? []
  • 15. $ git flow feature start login $ git flow feature finish login
  • 16. $ git flow release start v0.1.0 $ git flow release finish v0.1.0
  • 17. git-flow-completion Bash, Zsh
  • 18.
    • A successful Git branching model
      • http://nvie.com/git-model
    • Why aren’t you using git-flow?
      • http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/
    • http://github.com/nvie/gitflow
    • http:// github.com/bobthecow/git -flow-completion

×