• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Git flow Introduction
 

Git flow Introduction

on

  • 1,642 views

An introduction to Git Flow

An introduction to Git Flow

Statistics

Views

Total Views
1,642
Views on SlideShare
1,640
Embed Views
2

Actions

Likes
1
Downloads
33
Comments
0

1 Embed 2

http://www.linkedin.com 2

Accessibility

Upload Details

Uploaded via as Adobe PDF

Usage Rights

CC Attribution-NonCommercial LicenseCC Attribution-NonCommercial License

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Git flow Introduction Git flow Introduction Presentation Transcript

    • 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 of the changes should be merged back intomaster somehow and then tagged with arelease number.
    • 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.
    • Supporting branches● Feature branches● Release branches● Hotfix branches
    • 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
    • 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.
    • Hotfix branches● May branch off from: master● Must merge back into: develop and master● Branch naming convention: hotfix-*
    • 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>Push / Pull feature branches git flow feature publish <name> git flow feature pull <remote> <name>
    • 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 of thebranching and releasing processes.