1. Waltzing with Branches Chris Oldwood Agile on the Beach 2015 @chrisoldwood / gort@cix.co.uk

2. Cargo Cult Software Engineering “They go through the motions of looking like effective organizations that are stylistically similar. But without any real understanding of why the practices work […]” -- Steve McConnell

3. Another cult is born… https://twitter.com/jezhumble/status/400071665482088448

4. Read the small print! https://twitter.com/jezhumble/status/400071665482088448

5. Waltzing with Bears

6. <<<<<<<<<<<< Knox in box. Fox in socks. Knox on fox in socks in box. ============ Socks on Knox and Knox in box. Fox in socks on box on Knox. >>>>>>>>>>>>

7. “RISK MANAGEMENT IS PROJECT MANAGEMENT FOR ADULTS”

8. Branching is a technique for managing risk, but…

9. Branching is not the only technique for managing risk

10. Risk: Loss of Productivity

11. Risk: Loss of Confidence

12. Branching

13. Merging

14. Integration/Development Branch 12345

15. Release Branch 34567 AB Stable Volatile

16. Branching From a Label 34567 AB v1 XY v1.1

17. Feature/Task/Private Branch 34567 ABC More Stable More Volatile

18. Shelving 12456 3

19. Integration Pains 34567 XYZ AB

20. Cherry Picking 34567 ACB

21. No Branch (Feature Toggles) 1a21b31c Always Ready to Ship

22. Continuous Integration is a mindset, not a tool.

23. Gatekeeper Workflows 34567 XY B Alice Bob C GK Z D

24. Manual Checks & Balances

25. Automation

26. Branching can be used to manage risk, but there are more productive ways.

27. Questions?

28. Blog:http://chrisoldwood.blogspot.com @chrisoldwood / gort@cix.co.uk Articles:http://www.chrisoldwood.com/articles.htm