Re: Problem with merging

Thx very much, that solved my problem :-)

Strangely, until now i was able to merge branches into trunk without
this option....

Regards,
Peter

On Fri, Jan 14, 2011 at 2:42 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schweizer_at_gmail.com wrote:
>> Hi Folks,
>>
>> i want to merge a branch into trunk. For that i got the first revision
>> of the branch with (svn log --stop-on-copy => 2854). Now i want to
>> merge with "svn merge -r 2854:3143 ^/branches/mybranch ." in a trunk
>> working dir.
>
> You need to use the --reintegrate option to merge branches back to trunk.
> See http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate
>
> Stefan
>
Received on 2011-01-14 14:54:24 CET