Pubmi gitflow
74
Git Flows
-
Upload
simone-gentili -
Category
Technology
-
view
899 -
download
0
Transcript of Pubmi gitflow
Git Flows
Welcome to my gitflow talk for the php user group
Simone (Demo) Gentili @sensorario
Goal: understand if gitflow and other flows
• Git flow • Versioning Semantico • Other flows • A PHP Open Source Project
Why this talk?
$ git config --global \merge.ff false
$ git revert j890y4
Feature branch
Release branch
Hotfix branch
Recap
Semantic Versioning
x.y.z
Major.minor.patch
0.*
Major.minor.patch
x.y.z
MAJOR version when you make incompatible API changes,
Major.minor.patch
x.y.z
MINOR version when you add functionality in a backwards-
compatible manner
Major.minor.patch
x.y.z
PATCH version when you make backwards-compatible
bug fixes.
• centralized • feature branch • forking workflow
Other flows
• only master branch • work in local repository • push to origin/master • rebase • linear history • remote is sacre
Centralized
• master always clean • branches isolated • pull request • code review
Feature branch
• more remote servers • each developer has server side repo • two repo for each • each maintainer does not give access to private repo
Forking
“flows are guidelines rather than concrete rules”
Q&A
• 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
