log ConflictError details

src/ZODB/ConflictResolution.py

@@ -294,8 +294,8 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
         pickler.dump(meta)
         pickler.dump(resolved)
         return self._crs_transform_record_data(file.getvalue())
-    except (ConflictError, BadClassName):
-        pass
+    except (ConflictError, BadClassName), e:
+        logger.exception(str(e))
     except:
         # If anything else went wrong, catch it here and avoid passing an
         # arbitrary exception back to the client.  The error here will mask