edsger 0.13.3 → 0.13.4

package/dist/utils/git-branch-manager.js

@@ -409,42 +409,42 @@ export async function syncFeatBranchWithMain(featureId, githubToken, owner, repo
             branch: featBranch,
         });
         const featSha = featBranchData.commit.sha;
-        // Check if feat branch is already up to date (same as main or ahead)
-        // We need to merge main into feat to keep it updated
+        // Check if feat branch is already up to date
         if (verbose) {
             logInfo(`📥 Syncing ${featBranch} with ${baseBranch}...`);
             logInfo(`   ${baseBranch} SHA: ${mainSha.substring(0, 7)}`);
             logInfo(`   ${featBranch} SHA: ${featSha.substring(0, 7)}`);
         }
-        // Use GitHub merge API to merge main into feat branch
+        // If already at the same SHA, no need to update
+        if (mainSha === featSha) {
+            if (verbose) {
+                logInfo(`ℹ️  ${featBranch} is already up to date with ${baseBranch}`);
+            }
+            return true;
+        }
+        // Use git.updateRef to fast-forward feat branch to main's SHA
+        // This avoids creating a merge commit
         try {
-            await octokit.repos.merge({
+            await octokit.git.updateRef({
                 owner,
                 repo,
-                base: featBranch,
-                head: baseBranch,
-                commit_message: `chore: sync ${featBranch} with ${baseBranch}`,
+                ref: `heads/${featBranch}`,
+                sha: mainSha,
+                force: true, // Force update since feat branch may have diverged
             });
             if (verbose) {
-                logInfo(`✅ Successfully synced ${featBranch} with ${baseBranch}`);
+                logInfo(`✅ Successfully synced ${featBranch} to ${baseBranch} (${mainSha.substring(0, 7)})`);
             }
         }
-        catch (mergeError) {
-            // 409 means nothing to merge (already up to date)
-            if (mergeError.status === 409) {
-                if (verbose) {
-                    logInfo(`ℹ️  ${featBranch} is already up to date with ${baseBranch}`);
-                }
-                return true;
-            }
-            // 404 means branch doesn't exist (shouldn't happen since we checked above)
-            if (mergeError.status === 404) {
+        catch (updateError) {
+            // 422 means the ref doesn't exist or other validation error
+            if (updateError.status === 422 || updateError.status === 404) {
                 if (verbose) {
-                    logInfo(`ℹ️  ${featBranch} branch not found, skipping sync`);
+                    logInfo(`ℹ️  Could not update ${featBranch} ref, skipping sync`);
                 }
                 return true;
             }
-            throw mergeError;
+            throw updateError;
         }
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"