Introducing GitFlow

20/10/2015DOAN HONG QUAN

What Is GitFlow?A branching model for Git

Created by Vincent Driessen

Why using Gitflow?Parallel Development

Collaboration

Support For Emergency Fixes

How It Works

How It Works – Main branches

How It Works – Supporting branches

Feature branches

Release branches

Hotfix branches

Feature branches

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

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"

Release branches

Hotfix branches

References

http://nvie.com/posts/a-successful-git-branching-model/

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Thanks you!