Re: Suggestions for merging system?

[Stephen Cameron]

One point I forgot to mention in my previous post:

I wrote:

> When a new branch is to be created (when development on a 
> new release is to begin) the current newest branch is 
> merged to the trunk, then the new branch is created off 
> the trunk.

What I forgot to mention was that since no development is occurring on the
trunk this merge is pretty much guaranteed to be without conflicts, barring
accidental commits to the trunk, (which you can roll back prior to attempting
the merge anyway.)
-- steve


__________________________________________________
Do You Yahoo!?
Yahoo! Shopping - Thousands of Stores. Millions of Products.
http://shopping.yahoo.com/