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
