Function
ZODB.ConflictResolution.tryToResolveConflict

Signature

tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle, committedData='')