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
, which results in a conflict exception.
When JNothing
is returned no further try is performed and the saving is considered succesful by
keeping the current version in the database.
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.