The document discusses continuous integration and feature branches. It describes how one company, Henry, manages merging feature branches from multiple scrum teams into a trunk. Henry faces challenges with the manual and late merging process. The document suggests automating merging more frequently to apply agile principles and reduce integration problems. This would give Henry more time to focus on other important tasks.

1. Jenkins & Gitreconcil continuous integration & feature-branchesMai 28th , 2011Jenkins User Meetup @Paris©2011 Cloud Bees, Inc. All Rights Reserved

2. ©2011 CloudBees, Inc. All Rights ReservedNicolas De loofJava-Boy

3. New-Bee at

4. CommitterMaven(GWT)

5. JUG-LeaderLet’s talk about Henry (real nameobfuscated)©2011 CloudBees, Inc. All Rights Reserved

6. Working on top of a Scrum of ScrumsEachScrum-team has a reduced scope and dedicatedbranch for betterefficiencyHenry is « merge manager »©2011 CloudBees, Inc. All Rights Reserved

7. EachScrum-team follows agile development practices and uses c.i.But … Continuousintegration©2011 CloudBees, Inc. All Rights Reserved

8. (http://martinfowler.com/bliki/FeatureBranch.html)(isolated) Featurebranch©2011 CloudBees, Inc. All Rights Reserved

9. Poor-man continuousintegrationRequiresmerging Herecomes Henry« PromiscuousIntegration »©2011 CloudBees, Inc. All Rights Reserved

10. « membersof a team integratetheirworkfrequently. Eachintegrationisverified by an automatedbuildto detectintegrationerrorsas quickly as possible. (…) significantlyreducedintegrationproblems and allows a team to developcohesive software more rapidly. »http://martinfowler.com/articles/continuousIntegration.htmlContinuousIntegration©2011 CloudBees, Inc. All Rights Reserved

11. « Mege-manager »©2011 CloudBees, Inc. All Rights ReservedMerge branches at sprint-end

12. Build, Test

13. Commit intotrunk(on fridayevening)

14. alsoconsiderourproject-workflow©2011 CloudBees, Inc. All Rights Reservedhttp://nvie.com/posts/a-successful-git-branching-model/

15. Henry needs help … Volunteers ?©2011 CloudBees, Inc. All Rights Reserved

16. Mergeisdifficult : do itfrequentlyMergeismanual : automateMergecomestoolate : do it ASAPApply Agile principles©2011 CloudBees, Inc. All Rights Reserved

17. C.I. & feature-branches – simple (naive)©2011 CloudBees, Inc. All Rights Reserved

18. C.I. & feature-branches – team-focussed©2011 CloudBees, Inc. All Rights Reserved

19. C.I. & feature-branches – betterway©2011 CloudBees, Inc. All Rights Reserved