[Zope-dev] Bi-directional update of Data.fs

[Chris Withers]

Steve Alexander wrote:
> What does Lotus Notes offer to do if you get such a conflict?

Save both versions and ask the user to delete the one which isn't
needed, or merge the changes...

> Use Jim's new conflict resolution
> algorithm to try to settle conflicts. 

Urm? First I heard of this and it sounds like just the right sort of
thing...

Where can I find out more?

> If a conflict can't be settled,
> ask interactively, or apply some sort of policy (like "chris always
> wins" for example) and log the lost changes.

Heh... I like the sound of that ;-)

cheers,

Chris