@docupace/pipeline 1.0.64 → 1.0.65-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.64",
+  "version": "1.0.65-alpha.1",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/merge/cli-resolve.js

@@ -238,8 +238,12 @@ export async function autoResolveConflicts(options = {}) {
     try {
       if (verbose)
         console.log(`🔧 Applying '${strategy}' strategy to ${filePath}`);
-      mergeFunction(filePath);
-      resolvedCount++;
+      const result = mergeFunction(filePath);
+      if (result.success) {
+        resolvedCount++;
+      } else {
+        skippedCount++;
+      }
     } catch (error) {
       console.error(`❌ Failed to resolve ${filePath}: ${error.message}`);
       skippedCount++;

package/src/merge/merge-changelog.js

@@ -79,7 +79,7 @@ export function mergeChangelogFile(filePath) {
     }
 
     console.log('Changelog merge completed successfully');
-    return true;
+    return { success: true };
   } catch (error) {
     console.error(`Merge failed: ${error.message}`);
     throw error;

package/src/merge/merge-package.js

@@ -95,7 +95,7 @@ export async function mergePackageFile(filePath) {
       console.log('   Non-version conflicts require manual resolution');
     }
 
-    return result.success;
+    return result;
   } catch (error) {
     console.error(`❌ Merge failed: ${error.message}`);
     throw error;