> -----Original Message----- > From: Martin Sebor [mailto:[EMAIL PROTECTED] On Behalf Of Martin Sebor > Sent: Tuesday, April 01, 2008 4:11 PM > To: [email protected] > Subject: on branches and merging (was: Re: failing regression tests) > ... > > It occurs to me that even if most work were done on the release > branch(es) the changes would still need to merged only in the > opposite direction: from each branch to trunk and/or to other > branches. I'm afraid I don't see how the merging problem can > be avoided. Do you?
Sure. Don't branch until all issues scheduled for the release have been resolved and you're ready to start testing release candidates. That way, all main development occurs in only one place only: on the trunk. Brad.
