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

Resolving Tree Conflicts.

From: Rowan Sylvester-Bradley <rowan_at_sylvester-bradley.org>
Date: Wed, 17 May 2017 03:46:02 -0700 (PDT)

I have the current situation:

If I do "check for modifications" on my working copy, I see my list of source files and directories, with two directories marked "added(+), tree conflict".
If I right click on one of these and select Edit Conflicts, I see a dialog box:
The last operation tried to delete/move/rename the directory 'include', but the directory was already edited. Conflict sources:
Source Left: https://svn.riouxsvn.com/ticklist/public_html/swchoir/include@10
Source Right: https://svn.riouxsvn.com/ticklist/public_html/swchoir/include@16
Accept current working copy state (mark as resolved).

First question: which is Left and which is Right? These terms seem meaningless in this situation.
This seems to suggest that I have (or may have) three different versions, rev 10, rev 16 and my working copy. Which of these will be accepted if I click the Accept button? How do I check what the difference is between these three versions, before deciding what to do (which is presumably irreversible)?

I hope someone can help me get this mess sorted out!

Thanks - Rowan


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-05-17 12:46:15 CEST

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.