Re: branching several times a day (was Re: Sourcesafe user needs primer on branching source control)

Brad Appleton <brad@bradapp.net> wrote:

> So if you primarily work on one task at a time, you have a
> single branch all to yourself. When you are done with your
> change (and after you have "updated" from the main trunk)
> you "commit" your change to the main trunk.

I'm not sure I really understand what you mean. Are you saying you
would first merge from the trunk to your branch (the changes that other
people have committed to the trunk in the meantime), and then merge back
from your branch to the trunk? Isn't this going to cause lots of
problems? It has been my experience that it's best to always merge only
one way between branches.

-- 
Stefan Haller
Ableton
http://www.ableton.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org