Branch Strategies. Choose Wisely to Minimise Costs. @ZendCon2016

Is your team choosing the branching strategy from the beginning or is it switching after a while to better accommodate the current project stage? How does this affect you and what are the costs involved? Multiply this by the number of repositories, each playing a definite role in a large-scale project, and you will want to know how to minimize the impact.

The branching model needs to be simple - so that everyone involved can grasp it quickly; flexible - so it can serve the needs of very different roles within the project lifecycle; and adaptable - when you have a particular unforeseen need, it should not be a barrier.

See what others are already using, ask a few questions that might drive an adaptation of your choice, and then choose wisely. Then let your team spend their time on coding rather than painfully switching strategies.

Transcript

1. ‹#› CHOOSE WISELY TO MINIMISE COSTS BRANCHING STRATEGIES Georgiana Gligor / @gbtekkie
2. 2 Georgiana Gligor ✤ Geek. Mother. Do-er. ✤ Crafting LAMP enterprise apps ✤ Large-Scale Application Architect ✤ PHP Cluj Meetup Organiser ✤ Systems Engineering PhD Student @gbtekkie gb@tekkie.ro
3. ‹#›
4. ‹#›
5. 5 magic bullet solving conflicts build a one-size-fits-all recipe daily usage of git commands WE ARE NOT TALKING ABOUT
7. 7 where to look when you need help highlight costs framework to make informed decisions WE WILL AIM FOR
8. VERSION CONTROL SYSTEMS
9. 9 2015 Stack Overflow Developer Survey PRESENT Git SVN TFS Mercurial CVS Perforce Other I don’t use source control 9.3% 5.8% 3.3% 4.2% 7.9% 12.2% 36.9% 69.3%
10. 10 NO VCS
11. 11 NON-DISTRIBUTED VCS
12. 12 It’s not like git got everything right, but it got all the really basic issues right in a way that no other SCM had ever done before. Linus Torvalds, 2014 linux.com 2015 interview
13. 13 strategies stakeholders questions concepts AGENDA
14. STAKEHOLDERS
15. ‹#› imgur.com/gallery/yBa1OGm developer
16. 16 DEVELOPER
17. ‹#› https://flic.kr/p/oz7DzV tester
18. 18 TESTER
19. ‹#› https://flic.kr/p/cA85MY package builder
20. 20 Photo Credits: https://flic.kr/p/39LRXP https://flic.kr/p/hRKQ2h PACKAGE BUILDER
21. ‹#› https://flic.kr/p/sDZaia deployer
22. 22 DEPLOYER
23. ‹#› s integrator https://flic.kr/p/D2t2t
24. 24 INTEGRATOR
25. ‹#› BUG HUNTER https://flic.kr/p/owugoL bug hunter
26. 26 BUG HUNTER
27. ‹#› https://flic.kr/p/pxJ3o5 project manager
28. 28 PROJECT MANAGER
29. 29 PROJECT MANAGER
30. 30 PROJECT MANAGER
31. CONCEPTS
32. 32 MASTER
33. 33 PUBLIC VS LOCAL
34. 34 LONG-LIVED VS EPHEMERAL https:/ /github.com/php/php-src/branches/stale?page=3
35. 35 LONG-LIVED VS EPHEMERAL https:/ /github.com/php/php-src/branches
36. 36 TOPIC BRANCH
37. 37 MERGE WORKFLOW
38. 38 MERGE WORKFLOW
39. 39 REBASE WORKFLOW
40. 40 aka Trunk-Based Development STABLE TRUNK
41. 41 UNSTABLE TRUNK
42. 42 INTEGRATION PIPELINE
43. STRATEGIES
44. 44 LONE WOLF
45. 45 GIT FLOW
46. 46 GITHUB FLOW
47. 47 SIMPLE GIT WORKFLOW
48. 48 WORKFLOW FOR AGILE TEAMS
49. 49 GITLAB FLOW
50. 50 GITWORKFLOWS
51. 51 https://flic.kr/p/4eCRRZ
52. 52 Men have become the tools of their tools. HENRY DAVID THOREAU
53. 53 ✤ is anyone waisting time? ✤ polyglot technology stack ✤ Agile ✤ geographically distributed team ✤ production bugs pile up ✤ team restructuring TRANSITION?
54. QUESTIONS @gbtekkie https:/ /joind.in/talk/6d901
55. 55 RECOMMENDED READING ✤Guide to Enterprise PHP Development ✤A Rebase-based workflow ✤Git team workflows: merge or rebase? ✤Understanding the Git Workflow ✤Linus on clean history ✤gitworkflows ✤GitHub Flow ✤Atlassian Simple Git Workflow ✤GitLab Flow ✤Git Flow ✤Atlassian series on Git ✤Trunk-based Development
56. 56 Georgiana Gligor THANK YOU