Talk given for August 2012s Atlassian User Group in Sydney

1. Effective feature branching with Bamboo and JIRA

2. Continuous integration is about reducing the time between
creating a failure and being able todo something about it

3. Feature branching is where every feature (or story) gets
its own branch and it is only merged into the master when it is
completed.

4. It isolates developers from the bad changes of others and
allows master to be releasable at all times.

5. Git and Mercurial make creating and merging branches
extremely fast and easy

6. How does feature branching work?
master

7. How does feature branching work?
master
feature

8. How does feature branching work?
master
feature

9. How does feature branching work?
master
feature

10. How does feature branching work?
master
feature

11. Feature branching sucks for three reasons

13. Configuration drift and duplication

14. Configuration drift and duplication
Integration state is uncertain

15. Configuration drift and duplication
Integration state is uncertain
Not knowing in which branch a story is being worked on

16. Configuration drift and duplication

17. You don’t need to clone a existing build and configure it
to run your branch and remember to delete it when you
are done with your branch

19. Only create builds for
branches that match a pattern

20. Only create builds for
branches that match a pattern
Remove them automatically
when they have passed their
used by date

22. Branches belong to a Plan and
share its build configuration

23. Branches belong to a Plan and
share its build configuration
Have their own build history

24. Branches belong to a Plan and
share its build configuration
Have their own build history Behave just like Plans

25. Branches belong to a Plan and Branch switcher makes it easy
share its build configuration to navigate between Branches
Have their own build history Behave just like Plans

26. Integration state is uncertain

27. “How can I see if my new code in my branch works with
the code the rest of the team is developing?”

28. Gatekeeper
master

29. Gatekeeper
master
feature

30. Gatekeeper
master
feature

31. Gatekeeper
master
feature

32. Gatekeeper
master
feature

33. Here’s the Gatekeeper in action

34. When should I use the Gatekeeper?

35. Branch updater
master

36. Branch updater
master
feature

37. Branch updater
master
feature

38. Branch updater
master
feature

39. Branch updater
master
feature

40. Lets take a look at how easy it is to use Branch Updater

41. When should I use the Branch Updater?

42. Not knowing in which branch a story is being worked on

43. Not knowing in which branch a story is being worked on

45. Create a new branch who’s name contains a JIRA issue key

47. When Bamboo automatically detects the branch, it will find the key and link to JIRA

49. Any branches that reference the JIRA issue will then be visible from the issue

50. All you need is a Application Link to JIRA

51. How do you do feature branches?

52. Thanks for coming in today