[CodeCamp Cluj 2016] Branching strategies: Choose wisely to minimize costs

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. ‹#›
2. ‹#› CHOOSE WISELY TO MINIMISE COSTS BRANCHING STRATEGIES Georgiana Gligor / @gbtekkie / Tekkie Consulting
3. 3 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
4. ‹#›
5. ‹#›
6. 6 magic bullet solving conflicts build a one-size-fits-all recipe daily usage of git commands WE ARE NOT TALKING ABOUT
8. 8 where to look when you need help highlight costs framework to make informed decisions WE WILL AIM FOR
9. VERSION CONTROL SYSTEMS
10. 10 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%
11. 11 NO VCS
12. 12 NON-DISTRIBUTED VCS
13. 13 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
14. 14 strategies stakeholders questions concepts AGENDA
15. STAKEHOLDERS
16. ‹#› imgur.com/gallery/yBa1OGm developer
17. 17 DEVELOPER
18. ‹#› https://flic.kr/p/oz7DzV tester
19. 19 TESTER
20. ‹#› https://flic.kr/p/cA85MY package builder
21. 21 Photo Credits: https://flic.kr/p/39LRXP https://flic.kr/p/hRKQ2h PACKAGE BUILDER
22. ‹#› https://flic.kr/p/sDZaia deployer
23. 23 DEPLOYER
24. ‹#› s integrator https://flic.kr/p/D2t2t
25. 25 INTEGRATOR
26. ‹#› BUG HUNTER https://flic.kr/p/owugoL bug hunter
27. 27 BUG HUNTER
28. ‹#› https://flic.kr/p/pxJ3o5 project manager
29. 29 PROJECT MANAGER
30. 30 PROJECT MANAGER
31. 31 PROJECT MANAGER
32. CONCEPTS
33. 33 MASTER
34. 34 PUBLIC VS LOCAL
35. 35 LONG-LIVED VS EPHEMERAL https:/ /github.com/php/php-src/branches/stale?page=3
36. 36 LONG-LIVED VS EPHEMERAL https:/ /github.com/php/php-src/branches
37. 37 TOPIC BRANCH
38. 38 MERGE WORKFLOW
39. 39 MERGE WORKFLOW
40. 40 REBASE WORKFLOW
41. 41 aka Trunk-Based Development STABLE TRUNK
42. 42 UNSTABLE TRUNK
43. 43 INTEGRATION PIPELINE
44. STRATEGIES
45. 45 LONE WOLF
46. 46 GIT FLOW
47. 47 GITHUB FLOW
48. 48 SIMPLE GIT WORKFLOW
49. 49 WORKFLOW FOR AGILE TEAMS
50. 50 GITLAB FLOW
51. 51 GITWORKFLOWS
52. 52 https://flic.kr/p/4eCRRZ
53. 53 Men have become the tools of their tools. HENRY DAVID THOREAU
54. 54 ✤ is anyone waisting time? ✤ polyglot technology stack ✤ Agile ✤ geographically distributed team ✤ production bugs pile up ✤ team restructuring TRANSITION?
55. QUESTIONS @gbtekkie https:/ /joind.in/talk/6d901
56. 56 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
57. 57 Georgiana Gligor THANK YOU