peer possibly in conflict, cannot continue.

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?

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?

Regards
	Laurence


-------------------------------------------------------
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