Upgrade to Pro — share decks privately, control downloads, hide ads and more …

[SwanseaCon 2017] Branching strategies: Choose wisely to minimize costs

[SwanseaCon 2017] 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.

Georgiana Gligor

September 25, 2017

More Decks by Georgiana Gligor

Other Decks in Technology


  1. 2 Georgiana Gligor ✤ Geek. Mother. Do-er. ✤ Crafting LAMP

    enterprise apps ✤ Large-Scale Application Architect ✤ RomaniaPHP Conference Organiser ✤ Systems Engineering PhD Student @gbtekkie [email protected]
  2. 6

  3. 7 where to look when you need help highlight costs

    framework to make informed decisions AIMING FOR
  4. 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%
  5. 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
  6. 53 ✤ is anyone waisting time? ✤ polyglot technology stack

    ✤ geographically distributed team ✤ production bugs pile up ✤ team restructuring TRANSITION?
  7. 55 RECOMMENDED READING ✤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