Re: peer possibly in conflict, cannot continue.

Hi, Laurence:
   The code to handle the confliction is developing in progress, so
please wait.
>
> Hi, 
> I want to fix this problem/issue does anyone have any thoughts on it? 
> 
> Am I right in thinking that its due to files being chnaged both on the
client and server?
  Yes, you are right. Since both changed, this will make intersync fail
to do the synchronization.
> 
> I was thinking of keeping the files that are on the server and backing
up the clients version to file.hostname.randomnumber or something. Would
this be a sensible way to deal with it?
> 
  It will be a solution. More graceful confliction resolution will be
added to intermezzo as planned.
> Regards
> 	Laurence
--
Chen Yang






-------------------------------------------------------
This SF.net email is sponsored by: ObjectStore.
If flattening out C++ or Java code to make your application fit in a
relational database is painful, don't do it! Check out ObjectStore.
Now part of Progress Software. http://www.objectstore.net/sourceforge