@adecore/merge 0.49.6 → 0.50.0

package/dist/resolve.js

@@ -41,6 +41,17 @@ function covers(base, outer, inner) {
         return false;
     }
     const added = [...outer.slice(0, start), ...outer.slice(start + inner.length)];
+    if (added.length > 16 && added.length * base.length > 4096) {
+        // Most rejected candidates fail immediately; avoid indexing the whole conflict for them.
+        for (const line of added.slice(0, 4)) {
+            if (base.includes(line) && !inner.includes(line)) {
+                return false;
+            }
+        }
+        const original = new Set(base);
+        const retained = new Set(inner);
+        return added.every((line) => !original.has(line) || retained.has(line));
+    }
     return added.every((line) => !base.includes(line) || inner.includes(line));
 }
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/merge",
-  "version": "0.49.6",
+  "version": "0.50.0",
   "description": "Pure line diffs, three-way merge blocks and conflict resolution.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",

package/src/resolve.ts

@@ -53,6 +53,20 @@ function covers(base: readonly string[], outer: readonly string[], inner: readon
 
     const added = [...outer.slice(0, start), ...outer.slice(start + inner.length)];
 
+    if (added.length > 16 && added.length * base.length > 4096) {
+        // Most rejected candidates fail immediately; avoid indexing the whole conflict for them.
+        for (const line of added.slice(0, 4)) {
+            if (base.includes(line) && !inner.includes(line)) {
+                return false;
+            }
+        }
+
+        const original = new Set(base);
+        const retained = new Set(inner);
+
+        return added.every((line) => !original.has(line) || retained.has(line));
+    }
+
     return added.every((line) => !base.includes(line) || inner.includes(line));
 }