@docupace/pipeline 1.0.81-alpha.6 → 1.0.81-alpha.8

package/package.json

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

package/src/merge/cli-merge.js

@@ -66,17 +66,6 @@ function attemptMerge(sourceBranch, targetBranch, verbose = false) {
     console.log(`🔀 Merging ${sourceBranch} into current branch`);
   }
 
-  // Fetch and pull the source branch
-  try {
-    execSync(`git fetch origin ${sourceBranch}`, {
-      stdio: verbose ? 'inherit' : 'pipe',
-    });
-    if (verbose) console.log(`📥 Fetched source branch: ${sourceBranch}`);
-  } catch (error) {
-    if (verbose)
-      console.log(`⚠️  Failed to fetch ${sourceBranch}: ${error.message}`);
-  }
-
   try {
     execSync(`git merge --no-commit --no-ff origin/${sourceBranch}`, {
       stdio: 'pipe',
@@ -391,6 +380,25 @@ export function setupMerge(program) {
           );
         }
 
+        // Log current git head before validation
+        try {
+          const gitHead = execSync('git rev-parse HEAD', {
+            encoding: 'utf8',
+            stdio: 'pipe',
+          }).trim();
+          console.log(`📍 Current git HEAD: ${gitHead}`);
+
+          const gitDescribe = execSync('git describe --long', {
+            encoding: 'utf8',
+            stdio: 'pipe',
+          }).trim();
+          console.log(`🏷️  Git describe: ${gitDescribe}`);
+        } catch (error) {
+          console.log(
+            `📍 Current git HEAD: ${execSync('git rev-parse HEAD', { encoding: 'utf8', stdio: 'pipe' }).trim()}`,
+          );
+        }
+
         // Check for uncommitted changesets in source branch
         if (!mergeFail && !mergeSuccess) {
           checkForUncommittedChangesets(sourceBranch, verbose);