Re: tree conflict in merge after deleting and re-adding files

2013-10-09 Thread Stefan Sperling
On Wed, Oct 09, 2013 at 06:50:32PM +0200, Balázs Bámer wrote: > Hi All, > > TortoiseSVN 1.6.16, Build 21511 - 64 Bit , 2011/06/01 19:00:35 > Subversion 1.6.17, > apr 1.3.12 > apr-utils 1.3.12 > neon 0.29.6 > OpenSSL 1.0.0d 8 Feb 2011 > zlib 1.2.5 > > We have a problem. We have a trunk and a branc

RE: tree conflict in merge after deleting and re-adding files

2013-10-09 Thread Bob Archer
> Hi All, > > TortoiseSVN 1.6.16, Build 21511 - 64 Bit , 2011/06/01 19:00:35 Subversion > 1.6.17, apr 1.3.12 apr-utils 1.3.12 neon 0.29.6 OpenSSL 1.0.0d 8 Feb 2011 zlib > 1.2.5 We have a problem. We have a trunk and a branch, and wanted to merge > changes from branch to trunk. Due to some heavier

tree conflict in merge after deleting and re-adding files

2013-10-09 Thread Balázs Bámer
Hi All, TortoiseSVN 1.6.16, Build 21511 - 64 Bit , 2011/06/01 19:00:35 Subversion 1.6.17, apr 1.3.12 apr-utils 1.3.12 neon 0.29.6 OpenSSL 1.0.0d 8 Feb 2011 zlib 1.2.5 We have a problem. We have a trunk and a branch, and wanted to merge changes from branch to trunk. Due to some heavier file-confli