Re: Merging With Concurrent Development

Peter Kahn wrote:
> What pattern works best for handling merging of code between active
> branches when concurrent development is going on?
>
> Merge as changes are made?
> Merge when branch reaches milestone?
> Merge when branch releases?

Merge early, merge often. When things are fresh in people's heads and
very close together the merge will work perfectly. After a long time
when the files have drifted apart a ways then conflicts will occur and
the changes will be so long out of people's heads that they won't
remember the changes. Merge as early as possible.

> So, I'm left with several paths that all have costs and all seem not
> that great. Is there another strategy out there that is better?

You could always go into real estate.

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 19 06:50:36 2006