Dealing with bdr update/update conflicts

Hi all,

I've been testing bdr over the last few days and trying to simulate
conflicts.

For an update/update conflict I powered down node a and updated on node b.
Then powered down node b and updated node a and powered node b back on.

The situation I'm left in is that replication happens one way and it's
possible for me to get each record to be identical but whenever I try and
update in the other direction it doesn't replicate and I get this entry in
the conflict history log.

conflict_id | 860
local_node_sysid | 6166345561721046825
local_conflict_xid | 4990
local_conflict_lsn | 0/CA06DD98
local_conflict_time | 2015-07-08 16:30:29.276713+00
object_schema | public
object_name | table
remote_node_sysid | 6166334043667378995
remote_txid | 3114
remote_commit_time | 2015-07-08 15:45:44.999168+00
remote_commit_lsn | 1/4104FF98
conflict_type | update_update
conflict_resolution | last_update_wins_keep_local
local_tuple |
{"table_id":1452776,"last_update_id":"xxx","password":"obs","username":"final7","acc_id":1,"last_update_time":"2015-07-08T16:16:34.854137+00:00","make_public":false}
remote_tuple |
{"table_id":1452776,"last_update_id":"xxx","password":"obs","username":"final8","acc_id":1,"last_update_time":"2015-07-08T15:45:44.994954+00:00","make_public":false}
local_tuple_xmin | 4988

--
Giles Westwood