git-flow: a successful branching model

Transcript

1. git-flow a successful branching model
2. branching model
4. decentralized but centralized
5. origin subteam fetches subteam fetches subteam fetches
6. the main branches
7. develop master versão inicial de prod próximo release em prod próximo release em prod WIP para próximo release production-ready state
8. supporting branches
9. • Feature branches • Release branches • Hotfix branches
10. feature branches
11. •branch off from: develop •merge back into: develop •branching name convention, except: •master •develop •release-* •hotfix-*
12. feature branches develop início desenv. nova feature fim desenv. nova feature feature integrada
13. $ git checkout -b myfeature develop Switched to a new branch “myfeature” $ git checkout develop Switched to branch “develop” $ git merge --no-ff myfeature Updating ea1b82a..05e9557 (Summary of changes) $ git branch -d myfeature Deleted branch “myfeature” (was 05e9557). $ git push origin develop branching off merging into
14. $ git flow feature start myfeature Switched to a new branch “myfeature” branching off $ git flow feature finish myfeature Switched to branch “develop” Updating ea1b82a..05e9557 (Summary of changes) Deleted branch “myfeature” (was 05e9557). merging into
15. release branches
16. •branch off from: develop •merge back into: develop and master •branch name convention: •release-*
17. $ git checkout -b release-1.2 develop Switched to a new branch “release-1.2” $ git checkout master Switched to branch “master” $ git merge --no-ff release-1.2 Merge made by recursive. (Summary of changes) $ git tag -a 1.2 branching off merging into $ git checkout develop Switched to branch “develop” $ git merge --no-ff release-1.2
18. $ git flow release start 1.2 Switched to a new branch “release-1.2” branching off $ git flow release finish 1.2 Merge made by recursive. (Summary of changes) Deleted branch “release-1.2” (was f105d3). merging into
19. hotfix branches
20. •branch off from: master •merge back into: develop and master •branch name convention: •hotfix-*
21. hotfixes develop tag 1.2 master tag 1.2.1 bug em prod corrigido
22. $ git checkout -b hotfix-1.2.1 master Switched to a new branch “hotfix-1.2.1” $ git checkout master Switched to branch “master” $ git merge --no-ff hotfix-1.2.1 Merge made by recursive. (Summary of changes) $ git tag -a 1.2.1 branching off merging into $ git checkout develop Switched to branch “develop” $ git merge --no-ff release-1.2.1
23. $ git flow hotfix start 1.2.1 Switched to a new branch “hotfix-1.2.1” branching off $ git flow hotfix finish 1.2.1 Merge made by recursive. (Summary of changes) Deleted branch “hotfix-1.2.1” (was 071ab57). merging into
24. branching model
28. github-flow a simpler git workflow
29. •git-flow é mais do que precisam •deploy contínuo para produção (>1/dia) •a ideia de releases não importa •hotfixes ~= small features
30. master “deploiável”
31. branches descritivas
    ex: novo-widget-rota
32. commit local a todo momento
    push regularmente
33. pull request
34. review merge deploy
35. git-flow a successful branching model