Re: Is merging branches reliable?

Zsolt wrote:
> Hi,
>
> I have merged a branch to the main trunk and lot of old files from the
> branch overwrote the file in the main trunk.
>
> I use svnserve-1.3.0 and the merge was made via subclise-1.0.1.
>
> Zsolt

It's quite reliable, if you do it *carefully*. But if your branch has
diverged too far from the trunk, then you write it back to the trunk, you're
begging for grief. For example, in this case, you *probably* should have
merged changes from right *after* the original branch or copy operation.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 6 15:43:03 2006