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

2-way merging - bad?

From: John Browne <jkbrowne_at_gmail.com>
Date: 2005-06-22 06:58:45 CEST

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?

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

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