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

RE: Re: Merge branch to trunk problem

From: John Stokell <john.stokell_at_ultra-controls.com>
Date: Tue, 29 Oct 2013 05:41:30 -0700 (PDT)

It looks like what we were seeing is a difference in behaviour between 'Test merge' and 'Merge'. If I run the merge it does in fact complete without conflicts, however running the 'Test merge' suggests the tree conflict will occur.

Since the warning had come up with the 'Test merge' we hadn't bothered to try the 'Merge' since we had assumed the same issue would occur.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3067375

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 13:41:33 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.