Slides da palestra no Café Ágil da ThoughtWorks e Tá Safo em Belém, 10/08/2012. Outros links interessantes: http://www.youtube.com/watch?v=xzstASOvqNc http://continuousdelivery.com/2011/05/make-large-scale-changes-incrementally-with-branch-by-abstraction/

1. Trunk-Based
Development
Rafael Petry

2. Porque Odeio
Branches
Rafael Petry

5. Feature
Branching

6. http://martinfowler.com/bliki/FeatureBranch.html

7. http://martinfowler.com/bliki/FeatureBranch.html

8. merge HELL

10. Conflito Sintático
class Person
def initialize(name)
@name = name
<<<<<<< HEAD
@first_name = name.split.first
=======
logger.debug "Registrado usuário #{name}"
>>>>>>> test
end
end

11. Conflito Semântico

12. “Continuous Integration is a software development
practice where members of a team integrate their work
frequently, usually each person integrates at least daily -
leading to multiple integrations per day. Each integration
is verified by an automated build (including test) to detect
integration errors as quickly as possible. Many teams find
that this approach leads to significantly reduced
integration problems and allows a team to develop
cohesive software more rapidly.”
Martin Fowler

14. “The bigger the apparent
reason to branch, the more
you shouldn’t branch.”
Jez Humble and David Farley

15. Feature
Toggles

16. <% if feature?(:new_awesome_feature) %>
<li><%= link_to “Clique!!!”, new_feature_url %></li>
<% end %>

17. if feature?(:new_awesome_feature)
# faz algo fantástico!
else
# faz o que era feito antes...
end

18. http://code.flickr.com/blog/2009/12/02/flipping-out/

20. Branch by
Abstraction

21. “Feature Branching is a poor man's modular
architecture, instead of building systems
with the ability to easy swap in and out
features at runtime/deploytime they couple
themselves to the source control providing
this mechanism through manual merging.”
Dan Bodart

22. SomeController Event
DB
AnotherController

23. SomeController Event
DB
AnotherController SVC

24. SomeController Event
DB
AnotherController SVC

25. SomeController Event
DB
AnotherController SVC

26. SomeController Event
DB
AnotherController EventService SVC

27. Produção
SomeController Event
DB
AnotherController EventService SVC
Teste

28. SomeController Event
DB
AnotherController EventService SVC

29. SomeController
AnotherController EventService SVC
http://www.slideshare.net/dtsato/refatorao-em-larga-escala

30. Exceções

31. Spikes

32. Free Software

33. http://github.com

34. Obrigado!
Rafael Petry
rafaelpetry@thoughtworks.com
@rafaelpetry