subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Durket <dur...@highwire.stanford.edu>
Subject Re: Unresolvable conflicts????? - Fixed
Date Thu, 03 Mar 2011 17:44:38 GMT
Working now.

On Mar 3, 2011, at 8:26 AM, Michael Durket wrote:

> Just did that - still get the same conflict indications on a merge
> 
> On Mar 3, 2011, at 7:51 AM, Tony Sweeney wrote:
> 
>> 
>>> -----Original Message-----
>>> From: Michael Durket [mailto:durket@highwire.stanford.edu] 
>>> Sent: 03 March 2011 15:48
>>> To: users@subversion.apache.org
>>> Subject: Unresolvable conflicts?????
>>> 
>>> I am running a Subversion 1.4 repository (because Redhat 5 
>>> supplied only svn at release 1.4) and accessing it with a 1.6 
>>> client (because that's the current release level supplied by 
>>> Mac OS X). Michael,
>> 
>> I strongly, strongly suggest that you upgrade your repository to 1.6:
>> either figure out to get it from rpmforge or build it from source.
>> 
>> Tony. 
> 


Mime
View raw message