Trunk Based Development (CBSoft 2011)

1,644 views

Published on

0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
1,644
On SlideShare
0
From Embeds
0
Number of Embeds
730
Actions
Shares
0
Downloads
9
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

Trunk Based Development (CBSoft 2011)

  1. 1. Explorando oTrunk Based Development Daniel Wildt Carlos Lopes Guilherme Lacerda Trevisan Tecnologia ThoughtWorks FACENSA/UniRitter TargetTrust/Surya Software Innovation
  2. 2. agendaO ProblemaImpactosPossíveis soluçõesQuando usar branches?
  3. 3. O problema
  4. 4. Diferentes linhas de desenvolvimento, mesma base de código
  5. 5. branches!
  6. 6. Ronald Widha
  7. 7. merge hell
  8. 8. Conflito Sintáticoclass BlaBlaBla {<<<<<<< HEAD public void bla(Bla oldBla, New newBla) { oldBla.bla(); newBla.newBla();======= public void bla(Bla oldBla, Other otherBla) { oldBla.bla(); otherBla.otherBla();>>>>>>> other commit }}
  9. 9. Conflito Semânticoclass BlaBlaBla { public void something(Bla bla) {<<<<<<< HEAD bla = bla.plus(14);======= bla = bla.minus(7);>>>>>>> change //other stuff }}
  10. 10. Conflitos de Integração main.jsp: <%@include file="bla.jspf" %>master: outroBranch:new-file.jsp: bla.jspf -> ble.jspf<%@includefile="bla.jspf" %> main.jsp: <%@include file="ble.jspf" %>
  11. 11. O Merge Man
  12. 12. Integração Promíscua Martin Fowler
  13. 13. $$$$
  14. 14. Jon Wolter
  15. 15. Regressões
  16. 16. Jon Wolter
  17. 17. Jon Wolter
  18. 18. “The bigger the apparent reason to branch, the more you shouldn’t branch.” Jez Humble
  19. 19. “dont separate differingconcerns by using a VCS, use an abstraction instead.” Stacy Curl
  20. 20. branches porcontrole de código?
  21. 21. Estratégias
  22. 22. Feature Toggles
  23. 23. Branch By Abstraction
  24. 24. big bang Paul Hammant
  25. 25. iterativo Paul Hammant
  26. 26. Mudanças pequenasReleases frequentes
  27. 27. Componentes
  28. 28. Influência do Product Owner/Champion
  29. 29. Uncle Bob
  30. 30. Quando criar branches?Grande mudançasSpikesNovo release
  31. 31. Quando criar branches?Grande mudançasSpikesNovo release
  32. 32. Quando criar branches?Grande mudançasSpikesNovo release
  33. 33. Paul Hammant
  34. 34. Mais Informaçõeswww.codingbyexample.org
  35. 35. Obrigado!

×