From 618600c753e0eb4ef46a5fde42e1864650f66dd1 Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Thu, 24 Aug 2023 04:00:56 +0100 Subject: [PATCH] Fixed: - Now the empty (or deleted) file could be conflict-resolved. --- src/main.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.ts b/src/main.ts index 52fc5f9..9c72a58 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1901,6 +1901,9 @@ Or if you are sure know what had been happened, we can unlock the database from const ret = [] as Diff[]; do { const d = src.shift(); + if (d === undefined) { + return ret; + } const pieces = d[1].split(/([^\n]*\n)/).filter(f => f != ""); if (typeof (d) == "undefined") { break;