Re: unexpected conflict merging branch into trunk (after merging trunk into branch)

On Mar 22, 2007, at 09:11, Felix Gilcher wrote:

> merge svn+ssh://mldev/TRAINING/branches/test_merge svn+ssh://mldev/
> TRAINING/trunk /path/to/trunk/working/copy
>
> I might be wrong on the order of the urls, always have to try
> wether it's trunk first or branch first :). You might want to use --
> dry-run :)

It's correct the way you've written it. It's always merge <FROM_URL>
<TO_URL> <WC_PATH>. (merge creates a diff from <FROM_URL> to <TO_URL>
and applies it to <WC_PATH>)

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org