[Dev] VersionConflictError: the updated story

[Andi Vajda]

Two weeks ago I sent a message to this list explaining the status of version 
merging at that time. Here is an update.

In addition to child collection merging, I checked in code yesterday that 
resolves non-overlapping changes in items. If one or several attributes change 
in the current view and in the view being merged with, as long as no 
attribute changed in both views, the merge auto-resolves.

Overlapping merges are detected and currently not supported. They are reported 
with a MergeError naming the first overlapping attribute detected.

Unless there is a bug somewhere, you should not see raw VersionConflictErrors 
anymore, only MergeErrors or successful merges. Successful merges are logged.

Andi..