1. trunk
based
development
a.k.a.
branch
by
abstrac-on
feature
toggles
feature
flags
feature
bits
latent
code
…
Carlos
Lopes
ThoughtWorks

2. the
problem

3. different
streams,
same
codebase

4. the
solu4on?

5. branches!

7. ?!

8. merge
hell

9. Jon
Wolter

10. seman-c
conflicts

11. regressions

12. undeployable
code

13. and
so
on
…

14. so
…

15. branch
by
source
control

16. branch
by
abstrac4on

17. why?

18. bye
merge
hell

19. deployable
at
[almost]
any-me

20. understanding

21. boCom
line
…

23. but
…

24. it
has
its
own
limita-ons,
like
anything

25. so
…
when
to
branch?

26. releases

27. Paul
Hammant

28. ok
ok
ok

29. …
but
how?

30. maybe
next
-me

31. now
what?
Stacy
Curl
–
Branching
by
Abstrac-on
Paul
Hammant
–
Branch
by
Abstrac-on
Jonathan
Wolter
–
Trunk
Based
Development
Lucas
Ward
–
SCM
Maturity
Model
Erik
Sowa
and
Rob
Loh
–
Feature
Bits
…
perhaps
a
more
detailed
presenta-on
on
the
subject?!?!?!

32. thanks!

33. more
info

34. some
references
hCp://digital-­‐compulsion.blogspot.com/2007/04/
branching-­‐by-­‐abstrac-on.html
hCp://jawspeak.com/tag/trunk-­‐based-­‐development/
hCp://paulhammant.com/blog/
branch_by_abstrac-on.html
hCp://mar-nfowler.com/bliki/FeatureBranch.html
hCp://mar-nfowler.com/bliki/FeatureToggle.html
hCp://www.lucasward.net/2010/02/maturity-­‐model-­‐
for-­‐source-­‐control-­‐scmm.html

35. don't
separate
differing
concerns
by
using
a
VCS,
use
an
abstrac-on
instead
Stacy
Curl

36. “feature
branching
is
a
poor
man's
modular
architecture,
instead
of
building
systems
with
the
ability
to
easy
swap
in
and
out
features
at
run-me/deploy-me
they
couple
themselves
to
the
source
control
providing
this
mechanism
through
manual
merging”
Dan
Bodart

37. Jon
Wolter

38. Jon
Wolter