Introducing GitFlow
-
Upload
quan-doan-hong -
Category
Software
-
view
180 -
download
4
Transcript of Introducing GitFlow
![Page 1: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/1.jpg)
Introducing GitFlow
20/10/2015DOAN HONG QUAN
![Page 2: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/2.jpg)
What Is GitFlow?A branching model for Git
Created by Vincent Driessen
![Page 3: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/3.jpg)
Why using Gitflow?Parallel Development
Collaboration
Support For Emergency Fixes
![Page 4: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/4.jpg)
How It Works
![Page 5: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/5.jpg)
How It Works – Main branches
![Page 6: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/6.jpg)
How It Works – Supporting branches
Feature branches
Release branches
Hotfix branches
![Page 7: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/7.jpg)
Feature branches
![Page 8: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/8.jpg)
Feature branches$ git checkout -b myfeature develop Switched to a new branch "myfeature"$ git checkout develop Switched to branch 'develop’
$ git merge --no-ff myfeatureUpdating ea1b82a..05e9557(Summary of changes)
$ git branch -d myfeature Deleted branch myfeature (was 05e9557).
$ git push origin develop
![Page 9: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/9.jpg)
Feature branches - WIP Pull Request1. Allows commit empty$ git commit --allow-empty
2. Push to origin$ git push origin myfeature
3. Make a pull request
4. Add issue id in the comment whenever commit$ git commit -m "Fix typo in introduction to user guide. Resolves: #1234"
![Page 10: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/10.jpg)
Release branches
![Page 11: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/11.jpg)
Hotfix branches
![Page 12: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/12.jpg)
References
http://nvie.com/posts/a-successful-git-branching-model/
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
![Page 13: Introducing GitFlow](https://reader034.fdocuments.net/reader034/viewer/2022042610/58a1b0721a28ab537c8b46fd/html5/thumbnails/13.jpg)
Thanks you!