Gitflow introduction

1. git-flow
Vinícius T. Sossella

2. Por Quê

4. protocolos

6. Main branches
- Develop
- We consider origin/develop to be the main branch where the
source code of HEAD always reflects a state with the latest
delivered development changes for the next release. Some
would call this the “integration branch”. This is where any
automatic nightly builds are built from.
- Master
- We consider origin/master to be the main branch where the
source code of HEAD always reflects a production-ready
state.

7. Supporting branches
- Feature branches
- Feature branch may branch from Develop
- Must be merged with develop branch
- Release branches
- Release branch may branch from Develop
- Must be merged with develop and master branch
- Hotfix branches
- Hotfix branch may branch from Master
- Must be merged with develop and master branch

8. Hands on
- git flow init (initialize basic branch structure)
FEATURE
- git flow feature start my-feature-name (will start from develop branch)
- git flow feature publish my-feature-name
- git flow feature finish my-feature-name
- git push origin my-feature-name

9. Hands on
RELEASE
- git flow release start my-release-name
- git flow release publish my-release-name
- git flow release finish my-release-name
- git push origin my-release-name
HOTFIX
- git flow hotfix start my-hotfix-name
- git flow hotfix finish my-hotfix-name

10. Prós, Contras
It makes the project's history
completely unreadable multiple version support
running CI on Dev Branches
Pessimistic Approach
The master/develop split is redundant
It's needlessly complex
Decentralized but centralized

11. refs
http://nvie.com/posts/a-successful-git-branching-model/
http://endoflineblog.com/gitflow-considered-harmful
http://www.slideshare.net/svenpeters/git-branching-for-agile-teams
https://guides.github.com/introduction/flow/