Applies the resolving strategy between the last known revision baseDoc
(or None if the document did not exist before to the client knowledge),
the last revision in the database lastDoc (or None if the document was deleted)
and the document the client wants to save currentDoc.
Applies the resolving strategy between the last known revision baseDoc
(or None if the document did not exist before to the client knowledge),
the last revision in the database lastDoc (or None if the document was deleted)
and the document the client wants to save currentDoc.
If no automatic merge could be found, then returns None
This strategy applies a simple rule: New is always better Whenever a conflict occurs when trying to save a document in the database, the newest document (the one the client wants to store) is taken and overrides the previous revision.