Captures ideas around branching and releasing strategy.<\/p>\n
Branch to release model<\/strong><\/p>\n I have used branch to release for many years for small, to moderately sized teams, though I think it can be applied to many team sizes and complexity of project. This setup has worked for me in 99% (leaving 1% off in case I forgot somewhere it didn’t make sense) of my projects. I will use git as my jargon, but can be applied to many different VCS’.<\/p>\n Some assumptions about this approach are:<\/p>\n Arguments against it:<\/p>\n In this diagram you are committing to master (M), and the second commit\u00a0you branch (B) 0.1. That gets deployed, tested, and approved. You then tag (T) as 0.1.0 and release that. You start to dev more on master and even\u00a0branch 0.2 to prep another release. Bug is found in production against\u00a00.1.0. If bug still exists in M, you fix the bug (BF) there with tests and\u00a0cherry-pick (CP) the commit to 0.1 and have it flow down the same stream\u00a0resulting in 0.1.1 tag like:<\/p>\n If the bug doesn’t exist in M, you fix in 0.1 with tests, commit, wash, rinse, repeat.<\/p>\n If cherry-pick cannot be applied cleanly, you fix in both, with tests, tag and release. This should be\u00a0a lot<\/strong> less likely if you are dicing up the problem into small chunks and committing small changes.<\/p>\n Captures ideas around branching and releasing strategy. Branch to release model I have used branch to release for many years for small, to moderately sized teams, though I think it can be applied to many team sizes and complexity of project. This setup has worked for me in 99% (leaving 1% off in case I … Continue reading Branching and Releasing<\/span> \n
\n
\n
\n
\n\n
\n \n T\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>.<\/code>0<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|<\/code><\/div>\nB\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>\u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a00.2<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>\/\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |<\/code><\/div>\nM --*--*--*--*--*--*--*--*--*--*<\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n\n\n
\n \n \u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>0.1<\/code>.<\/code>1<\/code><\/div>\nT\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>.<\/code>0<\/code>\u00a0 \u00a0 \u00a0 \u00a0\/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0 | +-------------------+<\/code><\/div>\nB\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>-CP-+ \u00a0 \u00a0\u00a0<\/code>0.2<\/code>\u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0|<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>\/\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 \/\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |<\/code><\/div>\nM --*--*--*--*--*--*--*--*--*--*--BF<\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n\n\n
\n \n \u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>0.1<\/code>.<\/code>1<\/code><\/div>\nT\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>.<\/code>0<\/code>\u00a0 \u00a0 \u00a0 \u00a0\/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0 |<\/code><\/div>\nB\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>--BF \u00a0 \u00a0 \u00a0<\/code>0.2<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>\/\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |<\/code><\/div>\nM --*--*--*--*--*--*--*--*--*--*<\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n\n\n
\n \n \u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>0.1<\/code>.<\/code>1<\/code><\/div>\nT\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>.<\/code>0<\/code>\u00a0 \u00a0 \u00a0 \u00a0\/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0 |<\/code><\/div>\nB\u00a0\u00a0\u00a0\u00a0\u00a0 <\/code>0.1<\/code>--BF \u00a0 \u00a0 \u00a0<\/code>0.2<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>\/\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 \/<\/code><\/div>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0<\/code>|\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 |<\/code><\/div>\nM --*--*--*--*--*--*--*--*--*--BF<\/code><\/div>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n<\/div>\n<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"