Git branching-model
4 likes4,992 views
This document outlines a Git branching model for managing code development. It describes using main branches like Master and Develop and support branches like Feature, Release, and Hotfix. The model advocates separating work into feature branches, merging them into develop, and merging develop into master upon release. It also lists tools for implementing git flow and sources for more information.
Git branching-model
- 1. Git Branching Model Aaron Huang ＠aar0ntw
- 2. via Vincent Driessen at http://nvie.com
- 3. Why Git ?
- 7. Lock
- 8. Merge
- 9. Pull
- 10. Review & Accept
- 11. via Vincent Driessen at http://nvie.com
- 12. Main Branches
- 13. Main Branches
- 14. Main Branches • Master
- 15. Main Branches • Master • Develop
- 16. Main Branches • Master • Develop
- 17. Main Branches • Master • Develop
- 18. Support Branches
- 19. Support Branches • Feature
- 20. Support Branches • Feature • Release
- 21. Support Branches • Feature • Release • Hotfix
- 22. Support Branches • Feature • Release • Hotfix
- 23. Support Branches • Feature • Release • Hotfix
- 24. Support Branches • Feature • Release • Hotfix
- 25. Support Branches • Feature • Release • Hotfix
- 26. Feature
- 27. Feature
- 28. Release
- 29. Hotfix
- 30. Tools https://github.com/nvie/gitflow MacOSX: brew install git-flow Windows: contribmsysgit-install.cmd Linux: apt-get install git-flow
- 31. Sources • A successful Git branching model • https://github.com/nvie/gitflow • http://code.google.com/p/gerrit/ • Agile, the next generation: Three ways to go beyond Scrum
- 32. End