2. A branch for every feature
Untangle your workflow and deployments
Nicolas Venegas

3. A branch for every feature
$ git log --summary
• Mainline vs. branch-per-feature workflow
• Continuous integration lost when branching?
• Benefits of branching:
More frequent deployments
Freedom to commit and experiment
Easier reviews and planning

4. A branch for every feature
Traditional mainline workflow
initial commit

5. A branch for every feature
Traditional mainline workflow
initial commit

6. A branch for every feature
Traditional mainline workflow
initial commit

7. A branch for every feature
Traditional mainline workflow
2.0
initial commit

8. A branch for every feature
Branch-per-feature development
initial commit

9. A branch for every feature
Branch-per-feature development
initial commit

10. A branch for every feature
Branch-per-feature development
initial commit

11. A branch for every feature
Branch-per-feature development
initial commit

12. A branch for every feature
Branch-per-feature development
2.0
initial commit

13. If it ain’t broke...

14. A branch for every feature
Continuous integration

15. A branch for every feature
Continuous integration

16. A branch for every feature
Continuous integration

17. A branch for every feature
Continuous integration communication

18. A branch for every feature
Continuous integration communication

19. A branch for every feature
Merging mainline into your feature

20. A branch for every feature
Merging mainline into your feature

21. A branch for every feature
Merging mainline into your feature

22. A branch for every feature
Integration branch

23. A branch for every feature
Integration branch

24. A branch for every feature
Integration branch

25. A branch for every feature
Integration branch

26. A branch for every feature
Integration branch

27. A branch for every feature
Integration branch

28. Branches with benefits

29. A branch for every feature
Deploy...?

30. A branch for every feature
Deploy...?

31. A branch for every feature
Deploy...?

32. A branch for every feature
Deploy!

33. A branch for every feature
Deploy!

34. A branch for every feature
Deploy!

35. A branch for every feature
Freedom to commit and experiment

36. A branch for every feature
Freedom to commit and experiment

37. A branch for every feature
Freedom to commit and experiment

38. A branch for every feature
Freedom to commit and experiment

39. A branch for every feature
Freedom to commit and experiment

40. A branch for every feature
Easier reviews and planning

41. A branch for every feature
Easier reviews and planning

42. A branch for every feature
Easier reviews and planning

43. A branch for every feature
Easier reviews and planning

44. A branch for every feature
Easier reviews and planning

45. Untangle your development workflow and
deployments using branch-per-feature development
#summit12

46. Thank you!