A successful git branching model 導讀
10 likes2,143 views
11/Jan/2015: 新增為什麼要用FF以及release圖片少說明的地方 12/Jan/2015: Fix typo
Ad
More Related Content
What's hot (20)
Viewers also liked (20)
Ad
Similar to A successful git branching model 導讀 (20)
Ad
More from Wen Liao (16)
A successful git branching model 導讀
- 1. Wen Liao A successful Git branching model 導讀 高雄，旗山
- 3. 目標 導讀 A successful Git branching model的軟體 Release方式 URL: http://nvie.com/posts/a-successful-git- branching-model/
- 4. 背景知識 Fast Forward Merge 簡稱FF
- 5. 背景知識 Fast Forward Merge in GIT: Before branch Master Branch Head Master Head
- 6. 背景知識 Fast Forward Merge GIT: After branch Master Branch Head Master Head
- 7. 背景知識 非Fast Forward Merge in GIT: Before branch Master Branch Head Master Head
- 8. 背景知識 非Fast Forward Merge GIT: After branch Master Branch Head Master Head merge
- 11. 作者的Branches 分類 ● Main branches ○ Master ○ Develop ● Supporting branches ○ Feature ○ Release ○ Hotfix
- 12. Main Branches Develop Master branch merge when production release merge when production release AKA: integration Master: 保證product ready 狀態 Develop: ● 隨時為下一次 Release準備 ● 放 ○ Feature ○ Fix ○ Release更動 ■ 版號 ■ 路徑 ■ ... Tag: 版號 Tag: 版號
- 13. Feature Branch ● 一定從develop branch出來 ● 寫完merge 回develop branch ● 寫的不如預期可以宰掉 ● 一定要用NO FF ● 可以定相關的branch name convention
- 14. Feature Branch: USE NO FF merge branch Develop Branch Head Develop Head merge
- 15. Release Branch ● 一定從develop branch出來 ● 用來處理Release相關事物 ○ 改版號 ○ 改PATH ○ ...
- 16. Release Branch ● Branch出來，處理Release相關事物中，如果 發現錯誤，要merge 回develop branch ● 確認無誤，可以出貨後 ○ merge回develop和master ○ master tag release版號 ○ 可以宰掉release branch ● 一定要用NO FF ● 可以定相關的branch name convention
- 17. Release Branch: USE NO FF merge branch Develop Release Head Develop Head Bug fix merge merge Master Master Head Tag with version
- 18. Hotfix Branch ● 一定從master branch出來 ● 用來處理Release後被客戶或是QA抓包的錯 誤 ● 可以順便進版表示該版本是Fix bug，如1.2晉 升到1.2.1 ● 修正完畢要merger回master，視情況merge回 develop ○ 因為有可能develop已無此功能或是已修正
- 19. Hotfix Branch ● 如果舊版正在進行hot fix，而新版release branch也正在進行中，請直接merge到release branch而不是develop branch ● 確認修正後，可以刪除該branch ● 一定要用NO FF ● 可以定相關的branch name convention
- 20. Hotfix Branch: USE NO FF merge branch Develop Hotfix Head Develop Head Bug fix merge merge Master Master Head 進版Bug fix