ConflictResolver r = new ConflictResolver() {
public Entry resolve(Entry entry, List<Entry> conflicts) {
Sync sync = SharingHelper.getSync(entry,false);
Conflicts c = sync.getConflicts(false);
if (c != null) c.discard();
return entry; // take the latest
}
};
entry = SharingHelper.resolveConflicts(entry, r, "jms");
sync = SharingHelper.getSync(entry);