Pros and cons of client conflict resolution

[azmeuk]

I see there is a client-conflict-resolution option, off by default. I could not find documentation about the advantages and drawbacks of using this option. I am guessing that:

• The server does not need to have the conflict resolution code on its pythonpath, so it may be easier to use than server-side conflict resolution.
• It generates more network communication between the client and the server, so it may be slower that server-side conflict resolution.

Is it something more? Maybe it worth writing some words on the README about this?