Re: merging code in two separate directories

On Aug 23, 2009, at 13:12, dave fournier wrote:

> I am a complete newbie with subversion.
> I have a project with two branches and the
> source files lie in two different directories.
> I would like to merge the two. My old approach would be
> to run diffs by hand and reconcile the differences.
> (There will be a lot of them.)
>
> My questions are:
>
> 1.) Is there a better way with subversion to do this?
>
> 2.) If so a quick sketch of how to go about this would be very
> useful.

Have you already read up on the "svn merge" command? There is a whole
chapter on merging in the book.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386564

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-23 21:54:08 CEST