Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,12 @@ export class MemoryStore {

const older = a.row.timestamp <= b.row.timestamp ? a.row : b.row;
const newer = a.row.timestamp <= b.row.timestamp ? b.row : a.row;

// Skip self-merge: when timestamps are equal, both could reference the same record
if (older.id === newer.id) {
continue;
}

const newerMeta = parseMetadata(newer.metadataJson);

const mergedIntoId = newer.id;
Expand Down