Git Flow

Transcript

1. Introduction to Git Flow Abid Jami l Tech Lead, Grocerapp
 @chabidgill
2. Introduction to Git and Github
 
 

3. Working with source code What we do • Copy & Paste file and folder s • Carry code on external drive s • Backup using manual copies • Forget to make cop y • Hard to manage copie s • Hard to share version b/w colllaborator s • No Descriptive History Problems
4. Introduction to Git & Github
 
 Git is a version control system that lets you manage and keep track of your source code history. GitHub is a cloud-based hosting service that lets you manage Git repositories. Git is a software. GitHub is a service.
5. Introduction to Gitflow
 

6. Introduction to Gitflow
 
 Gitflow is really just an abstract idea of a Git workflow. It helps with continuous software development and implementing DevOp s The Gitflow Workflow defines a strict branching model by Vincent Driessen designed around the project release .
7. Introduction to Gitflow
 
 Gitflow is ideally suited for projects that have a scheduled release cycle and for the DevOps best practice of continuous delivery. It assigns very specific roles to different branches and defines how and when they should interact.
8. How It Works? Master Branch : The master branch contains production code and it stores the official release history . Develop Branch : The develop branch contains pre-production code and serves as an integration branch for features.
9. How It Works?
10. How It Works? When using the git-flow extension library, executing git flow init on an existing repo will create the develop branch.
11. How It Works?
12. Branching Model Feature Branch Each new feature should reside in its own branch, which can be pushed to the central repository for backup/collaboration. But, instead of branching off of master, feature branches use develop as their parent branch.
13. Feature Branch
14. Feature Branch Creating a Feature Branc h Without git-flow extensions : •git checkout develo p •git checkout -b feature_branc h With git-flow extension : •git flow feature start feature_branch
15. Feature Branch Finishing a Feature Branc h Without git-flow extensions : • git checkout develo p • git merge feature_branc h With git-flow extension : • git flow feature start feature_branch
16. Branching Model Release Branch Once develop has acquired enough features for a release (or a predetermined release date is approaching), you fork a release branch off of develop. May branch off from develop and must merge into master and develop.
17. Release Branch
18. Release Branch Creating a Release Branc h Without git-flow extensions : •git checkout develo p •git checkout -b release/0.1. 0 With git-flow extension : •git flow release start 0.1.0
19. Release Branch Finishing a Release Branc h Without git-flow extensions : • git checkout maste r • git merge release/0.1. 0 With git-flow extension : • git flow release finish 0.1.0
20. Branching Model Hotfix Branch Maintenance or “hotfix” branches are used to quickly patch production releases. Hotfix branches are necessary to act immediately upon an undesired status of master. Hotfix branches are a lot like release branches and feature branches except they’re based on master instead of develop.
21. Hotfix Branch
22. Hotfix Branch Creating a Hotfix Branc h Without git-flow extensions : •git checkout maste r •git checkout -b hotfix_branch With git-flow extension : •git flow hotfix start hotfix_branch
23. Hotfix Branch Finishing a Hotfix Branc h Without git-flow extensions : • git checkout maste r • git merge hotfix_branc h • git checkout develo p • git merge hotfix_branch With git-flow extension : • git flow hotfix finish hotfix_branch
24. Command Cheat sheet
25. Summary The workflow is great for a release-based software workflow . Gitflow offers a dedicated channel for hotfixes to production
26. Overall Flow of GitFlow
 • A develop branch is created from maste r • Feature branches are created from develo p • When a feature is complete it is merged into the develop branc h • A release branch is created from develo p • When the release branch is done it is merged into develop and maste r • If an issue in master is detected a hotfix branch is created from maste r • Once the hotfix is complete it is merged to both develop and master
27. Thank You! Abid Jami l TechLead, Grocerap p @chabidgill