Download as PDF, PPTX
Uploaded byiCapps
Git branching
The document provides a brief overview of Git branching, explaining local and remote branches, pull requests, and guidelines for effective branching models. It highlights the Git-flow approach, detailing main branches like master and develop, as well as supporting branches such as feature, release, and hotfix branches. The document emphasizes naming conventions and the purposes of different branches in the context of continuous integration and version management.
More Related Content
Git branching
- 1. Git branching a shortwalkthrough
- 2. “A reference to abunch of commits”
- 3. The basics • Local branches • Remotebranches • Pull requests Continue not! A time for demo it is…
- 4. Aye sir, amodel! • No rules… • Guidelines & naming conventions ! • “A successful Git branching model” • Vincent Driessen (http://nvie.com/) • git-flow
- 5. Main branches • Continuous integration • master -Production (ready) • develop - Should be kept stable - Nightly builds • “Infinite lifetime”
- 6. Supporting branches • Feature branches • Releasebranches • Hotfix branches • “Limited lifetime”
- 7. Feature branches • “Topic branches” • Createout of develop • Merge into develop • Naming, pick anything but: - master - develop - release-* - hotfix-*
- 8.
- 9. Release branches • Create outof develop • Merge into develop or master! • Naming: release-* (versions) • Purpose: - Preparation for release - Minor bug fixing (after testing) - … - Keep development ongoing • Tags (when merging)
- 10. Hotfix branches • Create outof master • Merge into master and develop! • Naming: hotfix-* (versions) • Purpose: - Critical bug fixing - Keep development ongoing • Tags (when merging)
- 12.
- 13.