[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 2-way merging - bad?

From: Tim Blackman <Tim.Blackman_at_sun.com>
Date: 2005-06-22 17:23:16 CEST

On Jun 22, 2005, at 12:58 AM, John Browne wrote:

> Are there any "gotchas" with merging changes back and forth (2-way
> merging) between the trunk and a branch? The subversion book seems to
> imply that it's not a problem, but other things I've read say 2-way
> merging is bad.. Seems like if the developers are using "clean"
> working copies with no local mods when the merge occurs it should work
> fine.
>
> Any thoughts?

Merges don't always take into account files that have been moved in the
branch or the trunk.

- Tim

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 22 17:25:17 2005

This is an archived mail posted to the Subversion Users mailing list.