[top] / ZODB / ConflictResolution / tryToResolveConflict
tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle, committedData='')