fix(github-actions): update create-pr-for-changes to rebase on conflicts

Ensures the action automatically rebases pull requests when conflicts are detected, improving automation reliability and reducing manual intervention.

Author: alan-agius4

github-actions/create-pr-for-changes/lib/main.ts

@@ -91,11 +91,34 @@ async function main(): Promise<void> {
     });
 
     if (matchingPrs.length > 0) {
-      // A PR for the same set of changes does already exist. Exit.
-      core.info(
-        `Skipping PR creation, because there is already a PR: #${matchingPrs[0].number} ` +
-          `(${matchingPrs[0].html_url})`,
-      );
+      for (const matchingPr of matchingPrs) {
+        // A PR for the same set of changes does already exist. Exit.
+        // Check whether there is a PR is conflicting
+        const {data} = await git.github.pulls.get({
+          owner: repo.owner,
+          repo: repo.name,
+          pull_number: matchingPr.number,
+        });
+
+        if (data.mergeable) {
+          core.info(
+            `Skipping PR creation, because there is already a PR: #${matchingPr.number} ` +
+              `(${matchingPr.html_url})`,
+          );
+        } else {
+          core.info(
+            `PR is not mergable, rebasing PR: #${matchingPr.number} ` + `(${matchingPr.html_url})`,
+          );
+
+          // Rebase PR
+          await git.github.pulls.updateBranch({
+            owner: repo.owner,
+            repo: repo.name,
+            pull_number: matchingPr.number,
+          });
+        }
+      }
+
       return;
     } else {
       core.info(`No pre-existing PR found for branch '${branchName}'.`);