Trunk based vs git flow
•Download as PPTX, PDF•
1 like•887 views
The document discusses two different Git workflow models: trunk-based development and Gitflow. Trunk-based development involves having all work done directly on the main branch, or trunk, allowing for frequent integration and simple continuous delivery. Gitflow involves having permanent branches for features, releases and hotfixes, with more complex branch and merge management. The document compares the pros and cons of each model based on factors like team experience, project maturity, and whether the code is open source.
Recommended
More Related Content
What's hot
What's hot (20)
More from Hanokh Aloni
More from Hanokh Aloni (20)
Recently uploaded
Recently uploaded (20)
Trunk based vs git flow
- 1. What is it? Trunk-based GITFLOW needs you to have small stories/tasks Parallel Development a key enabler of Continuous Integration and by extension Continuous Delivery Collaboration Release Staging Area Support For Emergency Fixes
- 2. TRUNK BASED
- 13. TAGS TRUNK / master BRANCHES 0 0.1 FEATURE 2 FEATURE 1
- 14. TAGS TRUNK / master BRANCHES 0 0.1 FEATURE 2 FEATURE 1 FEATURE 3
- 15. TAGS TRUNK / master BRANCHES 0 0.1 FEATURE 2 FEATURE 1 FEATURE 3
- 16. TAGS TRUNK / master BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 17. TAGS TRUNK BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 18. TAGS TRUNK BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 19. TAGS TRUNK BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 20. TAGS TRUNK BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 21. TAGS TRUNK / master BRANCHES 0 0.1 0.2 FEATURE 2 FEATURE 1 FEATURE 3
- 22. GITFLOW
- 37. master dev BRANCHES 0 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 38. master dev BRANCHES 0 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 39. master dev BRANCHES 0 0.2 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 40. master dev BRANCHES 0 0.2 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 41. master dev BRANCHES 0 0.2 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 42. master dev BRANCHES 0 0.2 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 43. master dev BRANCHES 0 0.2 FEATURE 2 FEATURE 1 FEATURE 3 hotfix Release branches 0.1
- 44. Pros and cons Criteria Trunk-based GITFLOW Cost When you need to iterate quickly When you can pay the managerial cost Open source When you run an open- source project Expertise When you work mostly with senior developers When you have a lot of junior developers Progress When you are just starting up When you have an established product
Editor's Notes
- https://trunkbaseddevelopment.com/deciding-factors/
- For short-lived feature branches, these are not allowed: intermediate merges to master (trunk) merges (intermediate or not) to other people’s short-lived feature branches merges (intermediate or not) to any release branches (if you have them) variations of #2 that are direct from/to the developers clone on their workstation
- For short-lived feature branches, these are not allowed: intermediate merges to master (trunk) merges (intermediate or not) to other people’s short-lived feature branches merges (intermediate or not) to any release branches (if you have them) variations of #2 that are direct from/to the developers clone on their workstation
- For short-lived feature branches, these are not allowed: intermediate merges to master (trunk) merges (intermediate or not) to other people’s short-lived feature branches merges (intermediate or not) to any release branches (if you have them) variations of #2 that are direct from/to the developers clone on their workstation
- For short-lived feature branches, these are not allowed: intermediate merges to master (trunk) merges (intermediate or not) to other people’s short-lived feature branches merges (intermediate or not) to any release branches (if you have them) variations of #2 that are direct from/to the developers clone on their workstation
- https://www.toptal.com/software/trunk-based-development-git-flow