Update a few comments on the protocol, as it is important to define when a client node may try to resolve a conflict.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@64 71dcc9de-d417-0410-9af5-da40c76e7ee4