The document discusses various Git workflows including Git Flow, semantic versioning, and other approaches. It provides an overview of features branches, release branches, and hotfix branches in Git Flow. The talk aims to understand which workflows are best for PHP open source projects. It also briefly covers centralized, feature branch, and forking workflows as alternatives to Git Flow.

1. Git Flows

2. Welcome to my gitflow talk
for the php user group

3. Simone (Demo) Gentili
@sensorario

7. Goal: understand if
gitflow and other flows

8. • Git flow
• Versioning Semantico
• Other flows
• A PHP Open Source Project

9. Why this talk?

11. $ git config --global
merge.ff false
$ git revert j890y4

13. Feature branch

19. Release branch

27. Hotfix branch

34. Recap

54. Semantic Versioning

56. x.y.z

57. Major.minor.patch

58. 0.*

60. Major.minor.patch
x.y.z
MAJOR version when you make
incompatible API changes,

61. Major.minor.patch
x.y.z
MINOR version when you add
functionality in a backwards-
compatible manner

62. Major.minor.patch
x.y.z
PATCH version when you
make backwards-compatible
bug fixes.

67. • centralized
• feature branch
• forking workflow
Other flows

68. • only master branch
• work in local repository
• push to origin/master
• rebase
• linear history
• remote is sacre
Centralized

69. • master always clean
• branches isolated
• pull request
• code review
Feature branch

70. • more remote servers
• each developer has server side repo
• two repo for each
• each maintainer does not give access to private repo
Forking

71. “flows are guidelines
rather than concrete rules”

72. Q&A

73. • sensorario@gmail.com
• twitter.com/sensorario
• github.com/sensorario
Contacts

74. • http://nvie.com/posts/a-successful-git-branching-model/
• http://engineering.facile.it/git-flow-semantic-versioning/
• http://pcottle.github.io/learnGitBranching/
• http://semver.org/
• https://www.mindmup.com/
• http://martinfowler.com/bliki/FeatureToggle.html
• https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
Links