@panoptic-it-solutions/coolify-setup 1.1.27 → 1.1.29

package/dist/git.js

@@ -45,7 +45,11 @@ export async function commitAndPushToDevelop(files, originalBranch) {
         run('git init');
     }
     // Use passed-in branch name, or detect current branch
-    const sourceBranch = originalBranch || run('git branch --show-current');
+    let sourceBranch = originalBranch || run('git branch --show-current');
+    // Handle detached HEAD state
+    if (!sourceBranch) {
+        sourceBranch = 'develop';
+    }
     // Stage all specified files (use -A to also stage deletions)
     for (const file of files) {
         try {
@@ -143,8 +147,27 @@ export async function commitAndPushToDevelop(files, originalBranch) {
                         // Pull might fail, continue
                     }
                     // Merge the source branch (which has the commits)
-                    run(`git merge ${sourceBranch} --no-edit`);
+                    try {
+                        run(`git merge ${sourceBranch} --no-edit`);
+                    }
+                    catch {
+                        // Merge conflict - abort and report
+                        try {
+                            run('git merge --abort');
+                        }
+                        catch {
+                            // Abort might fail, continue
+                        }
+                        throw new Error(`Merge conflict between develop and ${sourceBranch}. Please resolve manually.`);
+                    }
                     run('git push origin develop');
+                    // Return to original branch
+                    try {
+                        run(`git checkout ${sourceBranch}`);
+                    }
+                    catch {
+                        // Might fail if worktree, that's ok - user is on develop
+                    }
                 }
             }
             else {
@@ -215,27 +238,72 @@ export async function setupGitHub(projectName) {
     }
     // Ensure we're on develop branch and push to it
     try {
-        const currentBranch = run('git branch --show-current');
+        const currentBranch = run('git branch --show-current') || 'develop';
         if (currentBranch !== 'develop') {
-            // Check if develop exists locally
+            // Try to checkout develop
+            let checkoutSucceeded = false;
             try {
-                run('git checkout develop');
+                // Check if develop exists locally
+                try {
+                    run('git rev-parse --verify develop');
+                    run('git checkout develop');
+                }
+                catch {
+                    // Create develop from current branch
+                    run('git checkout -b develop');
+                }
+                checkoutSucceeded = true;
             }
             catch {
-                // Create develop from current branch
-                run('git checkout -b develop');
+                // Checkout failed - might be worktree issue
+                // Try to push current branch to develop instead (if fast-forward possible)
+                try {
+                    // First fetch to check if develop exists remotely
+                    try {
+                        run('git fetch origin develop');
+                        // Check if current branch contains all develop commits (fast-forward possible)
+                        run(`git merge-base --is-ancestor origin/develop ${currentBranch}`);
+                    }
+                    catch {
+                        // Either develop doesn't exist remotely, or can't fast-forward
+                        // Try push anyway - will fail if develop exists and diverged
+                    }
+                    run(`git push origin ${currentBranch}:develop -u`);
+                    result.developBranchCreated = true;
+                    result.repoPushed = true;
+                    // Skip the rest of develop push logic since we already pushed
+                    checkoutSucceeded = false;
+                }
+                catch {
+                    result.warnings.push('Failed to push develop branch (checkout failed, possibly worktree conflict or branches diverged)');
+                    checkoutSucceeded = false;
+                }
+            }
+            if (checkoutSucceeded) {
+                // Pull latest changes before pushing to avoid non-fast-forward errors
+                try {
+                    run('git pull --rebase origin develop');
+                }
+                catch {
+                    // Pull might fail if remote doesn't exist yet, that's ok
+                }
+                run('git push origin develop -u');
+                result.developBranchCreated = true;
+                result.repoPushed = true;
             }
         }
-        // Pull latest changes before pushing to avoid non-fast-forward errors
-        try {
-            run('git pull --rebase origin develop');
-        }
-        catch {
-            // Pull might fail if remote doesn't exist yet, that's ok
+        else {
+            // Already on develop
+            try {
+                run('git pull --rebase origin develop');
+            }
+            catch {
+                // Pull might fail if remote doesn't exist yet, that's ok
+            }
+            run('git push origin develop -u');
+            result.developBranchCreated = true;
+            result.repoPushed = true;
         }
-        run('git push origin develop -u');
-        result.developBranchCreated = true;
-        result.repoPushed = true;
     }
     catch {
         result.warnings.push('Failed to push develop branch');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",