Trunk Based Development (CBSoft 2011)

  • 1,332 views
Uploaded on

 

  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Be the first to comment
No Downloads

Views

Total Views
1,332
On Slideshare
0
From Embeds
0
Number of Embeds
2

Actions

Shares
Downloads
7
Comments
0
Likes
1

Embeds 0

No embeds

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
    No notes for slide

Transcript

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