edsger 0.21.6 → 0.21.7

package/dist/services/branches.d.ts

@@ -61,19 +61,15 @@ export declare function getNextPendingBranch(options: PipelinePhaseOptions): Pro
 export declare function allBranchesCompleted(options: PipelinePhaseOptions): Promise<boolean>;
 /**
  * Get the base branch information for a branch.
- * Returns:
- * - If base_branch_id is null: use main (first branch in chain)
- * - If base_branch_id is set and that branch is completed: use main
- *   (completed means feat merged to main)
- * - If base_branch_id is set and that branch is merged: use base branch's feat branch
- *   (merged means dev merged to feat, not to main)
- * - If base_branch_id is set and that branch is not merged: use base branch's dev branch
  *
- * When base branch is merged/completed (squash merge), we need to use `git rebase --onto` to
- * correctly rebase only the new commits. This function returns both the new base
- * and the original base for this purpose:
- * - completed: baseBranch=main, originalBaseBranch=feat/xxx
- * - merged: baseBranch=feat/xxx, originalBaseBranch=dev/xxx
+ * Rebase strategies based on base branch status:
+ * - no base_branch_id: git rebase main (first branch in chain)
+ * - completed (feat merged to main): git rebase main
+ * - merged (dev merged to feat): git rebase --onto main feat/xxx
+ * - in_progress/pending: git rebase dev/xxx (base on parent dev branch)
+ *
+ * For 'merged' status, we use --onto to rebase only new commits (after feat branch)
+ * onto main, avoiding conflicts from re-applying squashed commits.
  */
 export declare function getBaseBranchInfo(branch: Branch, allBranches: Branch[], mainBranch?: string): Promise<{
     baseBranch: string;

package/dist/services/branches.js

@@ -160,19 +160,15 @@ export async function allBranchesCompleted(options) {
 }
 /**
  * Get the base branch information for a branch.
- * Returns:
- * - If base_branch_id is null: use main (first branch in chain)
- * - If base_branch_id is set and that branch is completed: use main
- *   (completed means feat merged to main)
- * - If base_branch_id is set and that branch is merged: use base branch's feat branch
- *   (merged means dev merged to feat, not to main)
- * - If base_branch_id is set and that branch is not merged: use base branch's dev branch
  *
- * When base branch is merged/completed (squash merge), we need to use `git rebase --onto` to
- * correctly rebase only the new commits. This function returns both the new base
- * and the original base for this purpose:
- * - completed: baseBranch=main, originalBaseBranch=feat/xxx
- * - merged: baseBranch=feat/xxx, originalBaseBranch=dev/xxx
+ * Rebase strategies based on base branch status:
+ * - no base_branch_id: git rebase main (first branch in chain)
+ * - completed (feat merged to main): git rebase main
+ * - merged (dev merged to feat): git rebase --onto main feat/xxx
+ * - in_progress/pending: git rebase dev/xxx (base on parent dev branch)
+ *
+ * For 'merged' status, we use --onto to rebase only new commits (after feat branch)
+ * onto main, avoiding conflicts from re-applying squashed commits.
  */
 export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main') {
     // No base branch - start from main (first branch in chain)
@@ -195,27 +191,21 @@ export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main'
     }
     // Check if base branch is completed (feat merged to main)
     if (baseBranch.status === 'completed') {
-        // Base branch's feat is merged to main - rebase directly from main
-        // Use feat branch as originalBaseBranch for --onto
-        if (!baseBranch.branch_name) {
-            return {
-                baseBranch: mainBranch,
-                needsRebase: false,
-                baseBranchMerged: true,
-            };
-        }
-        const featBranchName = baseBranch.branch_name.replace(/^dev\//, 'feat/');
+        // Base branch's feat is already squash-merged to main
+        // Just rebase directly to main - no need for --onto
+        // Main already contains all the changes, so a normal rebase will work correctly
         return {
             baseBranch: mainBranch,
-            originalBaseBranch: featBranchName, // Use feat branch for --onto
-            needsRebase: true,
+            // Don't set originalBaseBranch - we want a normal rebase, not --onto
+            needsRebase: false,
             baseBranchMerged: true,
         };
     }
-    // Check if base branch is merged (dev merged to feat)
+    // Check if base branch is merged (dev merged to feat, but feat not yet merged to main)
     if (baseBranch.status === 'merged') {
-        // Base branch's dev is merged to feat - rebase from base branch's feat branch
-        // Convert dev/xxx/1-name to feat/xxx/1-name
+        // Base branch's dev is squash-merged to feat
+        // Use --onto to rebase only new commits (after feat branch) onto main
+        // This correctly handles the case where feat contains squashed commits
         if (!baseBranch.branch_name) {
             return {
                 baseBranch: mainBranch,
@@ -225,8 +215,8 @@ export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main'
         }
         const featBranchName = baseBranch.branch_name.replace(/^dev\//, 'feat/');
         return {
-            baseBranch: featBranchName,
-            originalBaseBranch: baseBranch.branch_name, // Return original dev branch for --onto
+            baseBranch: mainBranch, // Rebase onto main
+            originalBaseBranch: featBranchName, // Use feat branch for --onto
             needsRebase: true,
             baseBranchMerged: true,
         };

package/package.json

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