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

Re: Problem with merging

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 14 Jan 2011 15:16:24 +0100

On Fri, Jan 14, 2011 at 02:53:11PM +0100, peter.schweizer_at_gmail.com wrote:
> Thx very much, that solved my problem :-)
>
> Strangely, until now i was able to merge branches into trunk without
> this option....
>

You got lucky. The --reintegrate option is quite important.
See http://mail-archives.apache.org/mod_mbox/subversion-users/201009.mbox/%3C20100929200923.GC7378@ted.stsp.name%3E

Stefan
Received on 2011-01-14 15:17:10 CET

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