You are what you eatHow branching strategy affects team culture

Dave Hounslow

@thinkfoo http://thinkfoo.wordpress.com

What Continuous Delivery says

Every Developer Commits Frequently

to an Always Releasable Trunk or Mainline

https://www.your-loop.com/

Author: Vincent Driessen Original blog post: http://nvie.com/posts/a-succesful-git-branching-model License: Creative Commons BY-SA

Author: Vincent Driessen Original blog post: http://nvie.com/posts/a-succesful-git-branching-model License: Creative Commons BY-SA

https://commons.wikimedia.org/wiki/File:Dauntless_bomb_drop.jpg

SVN

External Dev

Team

By Arivumathi - Own work, CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=24799312

By Arivumathi - Own work, CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=24799312

3-6 Month feature branch

The plan

Feature branching

4 Week iterations

Release ~ every 3 months

The plan

Feature branching

4 Week iterations

Release ~ every 3 months

Mainline development

2 Week iterations

Release every iterationWhat about regression

testing?

How will we do code reviews

We won't write such good code

CC BY-SA 3.0 NY Via http://www.thebluediamondgallery.com/pictures/automatic.jpg

Testing

Please hold, your pull request is important to us.

Pair Programming

Pair Programming By Dave Hounslow, CC BY-SA 3.0,

By Jdorwin at English Wikipedia - Transferred from en.wikipedia to Commons., Public Domain, https://commons.wikimedia.org/w/index.php?curid=3061466

“This is awesome, I can refactor

without upsetting my team mates”

Refactoring

By Fabio Alessandro Locati - My self, CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=5490100

“1000% more productive”

Today

“1000% more productive” by Dave Hounslow CC BY-SA 3.0

The result

Feature branching

Release ~3-4 Months 4 Week iterations Code Reviews Deteriorating code base Divided Team

Mainline development

Continuous Delivery

Release 2-3 per week 2 Week iterations Pair programming Improving code base United Team

The result

Feature branching

Release ~3-4 Months 4 Week iterations Code Reviews Deteriorating code b Divided Team

Mainline development

Continuous Delivery

Release 2-3 per week 2 Week iterations Pair programming Improving code base United Team

Doing Agile, Being Agile By Paul Downey CC BY 2.0 via https://www.flickr.com/photos/psd/9588038559

The result

Feature branching

Release ~3-4 Months 4 Week iterations Code Reviews Deteriorating code base Divided Team

Mainline development

Continuous Delivery

Release 2-3 per week 2 Week iterations Pair programming Improving code base United Team

Doing Agile, Being Agile By Paul Downey CC BY 2.0 via https://www.flickr.com/photos/psd/9588038559

Thanks

Dave Hounslow@thinkfoo

http://thinkfoo.wordpress.com