Your SlideShare is downloading. ×
0
Git Flow IntroductionDavid PaluyAugust 2012
BranchesA successful Git branching model
Master Branchorigin/master to be the main branch wherethe source code of HEAD always reflects aproduction-ready state.All ...
Develop Branchorigin/develop to be the main branch wherethe source code of HEAD always reflects astate with the latest del...
Supporting branches●   Feature branches●   Release branches●   Hotfix branches
Feature branches●   May branch off from: develop●   Must merge back into: develop●   Branch naming convention: anything ex...
Release branches●   May branch off from: develop●   Must merge back into: develop and master●   Branch naming convention: ...
Hotfix branches●   May branch off from:    master●   Must merge back into:    develop and master●   Branch naming    conve...
GitflowA collection of Git extensions to provide high-level repository operationshttps://github.com/nvie/gitflow
Initialize basic branch structuregit flow init [-d]The -d flag will accept all defaults.
List / Start / Finish feature branches  git flow feature  git flow feature start <name>  git flow feature finish <name>Pus...
List / Start / Finish release branches git flow release git flow release start <release> git flow release finish <release>
List / Start / Finish hotfix branchesgit flow hotfixgit flow hotfix start <release>git flow hotfix finish <release>
Summary
SummaryIt forms an elegant mental model that is easyto comprehend and allows team membersto develop a shared understanding...
Upcoming SlideShare
Loading in...5
×

Git flow Introduction

1,948

Published on

An introduction to Git Flow

0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
1,948
On Slideshare
0
From Embeds
0
Number of Embeds
2
Actions
Shares
0
Downloads
52
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

Transcript of "Git flow Introduction"

  1. 1. Git Flow IntroductionDavid PaluyAugust 2012
  2. 2. BranchesA successful Git branching model
  3. 3. Master Branchorigin/master to be the main branch wherethe source code of HEAD always reflects aproduction-ready state.All of the changes should be merged back intomaster somehow and then tagged with arelease number.
  4. 4. Develop Branchorigin/develop to be the main branch wherethe source code of HEAD always reflects astate with the latest delivered developmentchanges for the next release. Some would callthis the “integration branch”. This is where anyautomatic nightly builds are built from.Each time when changes are merged backinto master, this is a new production releaseby definition.
  5. 5. Supporting branches● Feature branches● Release branches● Hotfix branches
  6. 6. Feature branches● May branch off from: develop● Must merge back into: develop● Branch naming convention: anything except master, develop, release-*, or hotfix-*● Used to develop new features for the upcoming or a distant future release
  7. 7. Release branches● May branch off from: develop● Must merge back into: develop and master● Branch naming convention: release-*● Release branches support preparation of a new production release. They allow for minor bug fixes and preparing meta-data for a release (version number, build dates, etc.)● By doing all of this work on a release branch, the develop branch is cleared to receive features for the next big release.
  8. 8. Hotfix branches● May branch off from: master● Must merge back into: develop and master● Branch naming convention: hotfix-*
  9. 9. GitflowA collection of Git extensions to provide high-level repository operationshttps://github.com/nvie/gitflow
  10. 10. Initialize basic branch structuregit flow init [-d]The -d flag will accept all defaults.
  11. 11. List / Start / Finish feature branches git flow feature git flow feature start <name> git flow feature finish <name>Push / Pull feature branches git flow feature publish <name> git flow feature pull <remote> <name>
  12. 12. List / Start / Finish release branches git flow release git flow release start <release> git flow release finish <release>
  13. 13. List / Start / Finish hotfix branchesgit flow hotfixgit flow hotfix start <release>git flow hotfix finish <release>
  14. 14. Summary
  15. 15. SummaryIt forms an elegant mental model that is easyto comprehend and allows team membersto develop a shared understanding of thebranching and releasing processes.
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×