[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Suggestions for merging system?

From: Stephen Cameron
Subject: Re: Suggestions for merging system?
Date: Wed, 6 Dec 2000 07:33:41 -0800 (PST)

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]