Hi Stefan, Here is the information you requested;
svn status shared; C shared > local delete, incoming edit upon merge svn info shared; Tree conflict: local delete, incoming edit upon merge Source left: (dir) http://192.168.10.95/svn/repo/trunk/nz/shared@2 Source right: (dir) http://192.168.10.95/svn/repo/trunk/nz/shared@21844 As for the result, I'd like my local copy to discard the change made at /trunk/nz/shared since the exact same difference is present at; /trunk/shared Upon reflection it seems like a pretty silly idea to be had from the start... Replicate a hard path with an external from another path - and somehow expect it to behave correctly. But since I used the following; cd /trunk/nz svn up --set-depth exclude shared so as to ignore the /trunk/nz/shared directory intitally - it seemed ok to proceed with the external at the same location. Gavin, On 14/07/2011, at 1:32 AM, Stefan Sperling wrote: > On Thu, Jul 14, 2011 at 01:15:29AM +1000, Gavin "Beau" Baumanis wrote: >> and so now I get this when I try to do a merge.... >> I understand why I have a conflict.... >> I have an external that is a duplicate of a "real" location and there was an >> edit at the external path too. >> >> so now I get; >> >> --- Merging r21837 through r21844 into '.': >> C shared >> U patient/eDiagnostics.cfm >> U patient/meetdate.cfm >> U patient/qry_unreadDiagnosticsSELECT.cfm >> U patient/dsp_unreadDiagnosticsReviewList.cfm >> Summary of conflicts: >> Tree conflicts: 1 >> >> >> While I am happy why I have the conflict; >> How do I resolve it? > > There is no general rule you can apply to resolve any given tree conflict. > It depends on the situation and the desired merge result. > > So let's start with getting more information about this conflict > so we can understand it better. > > What do these commands print? > > svn status shared > svn info shared