@docupace/pipeline 1.0.61-alpha.0 → 1.0.61-alpha.1

package/package.json

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

package/src/merge/cli-merge.js

@@ -179,6 +179,21 @@ async function createAndCommitChangeset(
 /**
  * Merge into target branch
  */
+
+function branchExists(branchName) {
+  try {
+    // This will list branches that match the name
+    const result = execSync(`git branch --list ${branchName}`, {
+      encoding: 'utf8',
+    });
+    return result.trim().length > 0;
+  } catch (error) {
+    // If git fails, you can log or handle differently
+    console.error('Error checking branch:', error.message);
+    return false;
+  }
+}
+
 function mergeIntoTarget(
   sourceBranch,
   targetBranch,
@@ -192,20 +207,23 @@ function mergeIntoTarget(
     stdio: verbose ? 'inherit' : 'pipe',
   });
 
-  execSync(`git merge ${mergeBranchName}`, {
-    stdio: verbose ? 'inherit' : 'pipe',
-  });
+  if (branchExists(mergeBranchName)) {
+    execSync(`git merge ${mergeBranchName}`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
 
-  execSync(`git push origin ${targetBranch}`, {
-    stdio: verbose ? 'inherit' : 'pipe',
-  });
+    execSync(`git push origin ${targetBranch}`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
 
-  // Clean up merge branch
-  execSync(`git branch -d ${mergeBranchName}`, {
-    stdio: verbose ? 'inherit' : 'pipe',
-  });
+    execSync(`git branch -d ${mergeBranchName}`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
 
-  if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
+    if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
+  } else {
+    if (verbose) console.log(`✅ Nothing to merge`);
+  }
 }
 
 /**