Comments on: Dealing with Version Branches http://v1.ripper234.com/p/dealing-with-version-branches/ Stuff Ron Gross Finds Interesting Sun, 02 Aug 2015 11:03:35 +0000 hourly 1 https://wordpress.org/?v=4.5.3 By: ripper234 http://v1.ripper234.com/p/dealing-with-version-branches/comment-page-1/#comment-2361 Tue, 30 Nov 2010 21:21:50 +0000 http://v1.ripper234.com/?p=1295#comment-2361 Eli:

1. Merge code that 30 people committed from the version branch to trunk can be a daunting task for one person. I prefer delegating and distributing this responsibility to all the devs.
2. I agree – in general, merging quickly also is easier. The longer you wait, the harder it is to merge, because the odds the code has change increase with time.

]]> By: Eli http://v1.ripper234.com/p/dealing-with-version-branches/comment-page-1/#comment-2220 Sat, 12 Jun 2010 04:33:07 +0000 http://v1.ripper234.com/?p=1295#comment-2220 Ron,

This is a real problem and automating parts of the process can’t hurt. However, I remember two simpler solutions from my IBM days:

1. The person responsible for said branch has to make sure (after release) that the branch was merged back, by diffing the branch with the trunk and seeing that all bugs are in. This shouldn’t take too long.
2. When serious bug fixes are made to the release branch, it’s recommended to immediately merge them to trunk. Merging single bug fixes is usually very easy and takes a couple of minutes.

]]>