Re: Conflict Detection and Resolution

Please find the new patch set (v4). It implements the resolvers for
conflict type : 'delete_differ'.
Supported resolutions for ‘delete_differ’ are :
 - ‘last_update_wins': Apply the change with the latest timestamp (default)
 - 'remote_apply': Apply the remote delete.
 - 'keep_local': Skip the remote delete and continue.
 - 'error': The apply worker will error out and restart.

The changes made in the patches are as follows:
 - Updated the conflict detection patch (patch0001) to the latest
version from [1], which implements delete_differ conflict detection.
 - Patch0002 now supports resolver settings for delete_differ.
 - Patch0003 implements resolutions for delete_differ as well.
 - Patch0004 includes changes to support last_update_wins resolution
for delete_differ.

[1]
https://www.postgresql.org/message-id/OS0PR01MB571686E464A325F26CEFCCEF94DD2%40OS0PR01MB5716.jpnprd01.prod.outlook.com

--
Thanks,
Nisha