fix: use checkout -B to preserve uncommitted changes

- Use checkout -B instead of reset + checkout
- Preserves version bump changes made before PR creation
- Merge remote changes instead of rebase to handle conflicts

Author: omermorad

dist/index.js

@@ -130428,16 +130428,11 @@ async function createOrUpdateVersionPR(octokit, context3, options) {
   core3.debug(`Base branch: ${baseBranch}, Version branch: ${options.branch}`);
   await ensureBranchExists(octokit, owner, repo, options.branch, baseBranch);
   git2(`fetch origin ${options.branch}`);
+  git2(`checkout -B ${options.branch}`);
   try {
-    git2("reset --hard HEAD");
+    git2(`merge origin/${options.branch} --no-edit`);
   } catch {
-    core3.debug("No changes to reset");
-  }
-  git2(`checkout ${options.branch}`);
-  try {
-    git2(`pull origin ${options.branch} --rebase`);
-  } catch {
-    core3.debug("No remote changes to pull");
+    core3.debug("No remote changes to merge or merge conflict (will be resolved by push)");
   }
   git2('config user.name "contractual[bot]"');
   git2('config user.email "contractual[bot]@users.noreply.github.com"');

dist/index.js.map

@@ -53,23 +53,18 @@ export async function createOrUpdateVersionPR(
   // Ensure branch exists
   await ensureBranchExists(octokit, owner, repo, options.branch, baseBranch);
 
-  // Checkout the version branch (force to handle any uncommitted changes)
+  // Fetch the version branch
   git(`fetch origin ${options.branch}`);
 
-  try {
-    // Try to reset any uncommitted changes before checkout
-    git('reset --hard HEAD');
-  } catch {
-    core.debug('No changes to reset');
-  }
-
-  git(`checkout ${options.branch}`);
+  // Use checkout -B to create or reset the branch, keeping uncommitted changes
+  // This handles the case where the branch exists with stale state
+  git(`checkout -B ${options.branch}`);
 
-  // Pull latest changes to avoid conflicts
+  // Merge any remote changes to stay in sync
   try {
-    git(`pull origin ${options.branch} --rebase`);
+    git(`merge origin/${options.branch} --no-edit`);
   } catch {
-    core.debug('No remote changes to pull');
+    core.debug('No remote changes to merge or merge conflict (will be resolved by push)');
   }
 
   // Configure git identity