Git branching

486 views

Published on

This presentation covers a (short) walkthrough on Git branching. Local branches, remote branches, pull requests and the popular "Gitflow" branching model were discussed. However, a big part of the presentation was covered in a live demo, causing those topics not to be included in the slides.

CREDITS: Most images in the slides are from this blog post by Vincent Driessen: http://nvie.com/posts/a-successful-git-branching-model/.

Published in: Technology, Business
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
486
On SlideShare
0
From Embeds
0
Number of Embeds
140
Actions
Shares
0
Downloads
8
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git branching

  1. 1. Git branching a short walkthrough
  2. 2. “A reference to a bunch of commits”
  3. 3. The basics • Local branches • Remote branches • Pull requests Continue not! A time for demo it is…
  4. 4. Aye sir, a model! • No rules… • Guidelines & naming conventions ! • “A successful Git branching model” • Vincent Driessen (http://nvie.com/) • git-flow
  5. 5. Main branches • Continuous integration • master
 - Production (ready) • develop
 - Should be kept stable
 - Nightly builds • “Infinite lifetime”
  6. 6. Supporting branches • Feature branches • Release branches • Hotfix branches • “Limited lifetime”
  7. 7. Feature branches • “Topic branches” • Create out of develop • Merge into develop • Naming, pick anything but:
 - master
 - develop
 - release-*
 - hotfix-*
  8. 8. git merge --no-ff
  9. 9. Release branches • Create out of 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. 10. Hotfix branches • Create out of master • Merge into master 
 and develop! • Naming: hotfix-* (versions) • Purpose:
 - Critical bug fixing
 - Keep development ongoing • Tags (when merging)
  11. 11. git-flow https://github.com/nvie/gitflow
  12. 12. Questions?

×