Branching strategy - Feature vs Release
From: Gundersen, Richard <Richard.Gundersen_at_london-scottish.com>
Date: 2006-11-08 11:06:43 CET
We're having a big debate where I work over whether or not to use the
I've always worked with the latter. These are the reasons why:
1) Trunk is always stable. This always mimics exactly what's in
2) I do all new work on a branch (whether it's a small
a. My new changes don't affect the production codebase
b. When the customer who requested change X wants it to go live, I
The arguments against this approach are often:
1) Merging is hard. I don't like it
a. Well, in my experience with Subversion and CVS, merging is
2) Keeping track of lots of branches is hard.
a. Not really. If I use a good naming convention, a handful of
3) We have release branches so you know exactly whats on a
a. So does this approach - whatever is on the trunk is in
I can see why people would favour the release branch strategy, because
*** Disclaimer ***
This electronic communication is confidential and for the exclusive use of the addressee. It may contain private and confidential information. The information, attachments and opinions contained in this E-mail are those of its author only and do not necessarily represent those of London Scottish Bank PLC or any other members of the London Scottish Group.
If you are not the intended addressee, you are prohibited from any disclosure, distribution or further copying or use of this communication or the information in it or taking any action in reliance on it. If you have received this communication in error please notify the Information Security Manager at ISM@London-Scottish.com as soon as possible and delete the message from all places in your computer where it is stored.
We utilise virus scanning software but we cannot guarantee the security of electronic communications and you are advised to check any attachments for viruses. We do not accept liability for any loss resulting from any corruption or alteration of data or importation of any virus as a result of receiving this electronic communication.
Replies to this E-mail may be monitored for operational or business reasons. London Scottish Bank PLC is regulated by the Financial Services Authority.
This is an archived mail posted to the Subversion Users mailing list.