@docupace/pipeline 1.0.80 → 1.0.81-alpha.1

package/package.json

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

package/src/merge/cli-merge-all.js

@@ -428,6 +428,10 @@ async function mergeAll(verbose = false) {
         verbose,
       );
 
+      if (i < config.mergeBranches - 1) {
+        await new Promise((res) => setTimeout(res, 1000));
+      }
+
       if (!branchResult.success) {
         console.log(`Exiting due to failure of one or more merges`);
         process.exit(1);

package/src/merge/cli-merge.js

@@ -216,9 +216,27 @@ function mergeIntoTarget(
       stdio: verbose ? 'inherit' : 'pipe',
     });
 
-    execSync(`git branch -d ${mergeBranchName}`, {
-      stdio: verbose ? 'inherit' : 'pipe',
-    });
+    // Delete local merge branch
+    try {
+      execSync(`git branch -d ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted local merge branch: ${mergeBranchName}`);
+    } catch {
+      // Branch doesn't exist, which is fine
+    }
+
+    // Delete remote merge branch
+    try {
+      execSync(`git push origin --delete ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted remote merge branch: ${mergeBranchName}`);
+    } catch {
+      // Remote branch doesn't exist, which is fine
+    }
 
     if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
   } else {
@@ -269,6 +287,56 @@ function cleanupFailedMerge(verbose = false) {
   }
 }
 
+/**
+ * Check if source branch has uncommitted changesets
+ */
+function checkForUncommittedChangesets(sourceBranch, verbose = false) {
+  if (verbose)
+    console.log(`🔍 Checking for uncommitted changesets in ${sourceBranch}`);
+
+  // Store current branch
+  const currentBranch = execSync('git branch --show-current', {
+    encoding: 'utf8',
+    stdio: 'pipe',
+  }).trim();
+
+  try {
+    // Checkout source branch
+    execSync(`git checkout ${sourceBranch}`, {
+      stdio: 'pipe',
+    });
+
+    // Check for .md files in .changeset directory (excluding README.md)
+    try {
+      const changesetFiles = execSync(
+        'find .changeset -name "*.md" -not -name "README.md" 2>/dev/null | head -1',
+        {
+          encoding: 'utf8',
+          stdio: 'pipe',
+        },
+      ).trim();
+
+      if (changesetFiles) {
+        throw new Error(
+          `Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
+        );
+      }
+    } catch (error) {
+      if (error.message.includes('Cannot merge')) {
+        throw error;
+      }
+      // If find command fails (no .changeset directory), that's fine
+    }
+
+    if (verbose) console.log('✅ No uncommitted changesets found');
+  } finally {
+    // Return to original branch
+    execSync(`git checkout ${currentBranch}`, {
+      stdio: 'pipe',
+    });
+  }
+}
+
 export function setupMerge(program) {
   program
     .command('merge')
@@ -306,6 +374,11 @@ export function setupMerge(program) {
           );
         }
 
+        // Check for uncommitted changesets in source branch
+        if (!mergeFail && !mergeSuccess) {
+          checkForUncommittedChangesets(sourceBranch, verbose);
+        }
+
         // 1. Create merge branch from target branch
         const mergeBranchName = createMergeBranch(
           sourceBranch,