Fix: Add PR branch update before auto-merge to prevent base branch conflicts

Author: danieloh30

.github/workflows/dependabot-auto-merge.yml

@@ -30,6 +30,14 @@ jobs:
           PR_URL: ${{ github.event.pull_request.html_url }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Update PR branch
+        run: |
+          # Update the PR branch with the latest from base branch
+          gh pr update-branch "$PR_URL" || echo "Branch already up to date or cannot be updated"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
       - name: Enable auto-merge for Dependabot PRs
         run: gh pr merge --auto --squash "$PR_URL"
         env:
@@ -82,6 +90,15 @@ jobs:
             console.log(`PR #${prNumber} is from Dependabot: ${isDependabot}`);
             return isDependabot;
 
+      - name: Update PR branch
+        if: steps.check-dependabot.outputs.result == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=${{ steps.pr.outputs.result }}
+          # Update the PR branch with the latest from base branch
+          gh pr update-branch $PR_NUMBER --repo ${{ github.repository }} || echo "Branch already up to date or cannot be updated"
+      
       - name: Merge PR
         if: steps.check-dependabot.outputs.result == 'true'
         env:

.github/workflows/dependabot-automerge.yml

@@ -31,6 +31,18 @@ jobs:
           wait-interval: 30
           allowed-conclusions: success,skipped,neutral
 
+      - name: Update PR branch
+        if: |
+          steps.wait-for-checks.outcome == 'success' &&
+          (steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
+          steps.metadata.outputs.update-type == 'version-update:semver-minor')
+        run: |
+          # Update the PR branch with the latest from base branch
+          gh pr update-branch "$PR_URL" || echo "Branch already up to date or cannot be updated"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
       - name: Enable auto-merge for Dependabot PRs
         if: |
           steps.wait-for-checks.outcome == 'success' &&