From 8c0a7934128e472ddbfdc726c95305072c93da66 Mon Sep 17 00:00:00 2001
From: gabemeola <14303404+gabemeola@users.noreply.github.com>
Date: Wed, 1 Jul 2026 15:53:31 +0000
Subject: [PATCH] feat: rebase PR branch on latest main before bumping

---
 .github/workflows/release-checker.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/release-checker.yml b/.github/workflows/release-checker.yml
index be3d803..ea5fd8b 100644
--- a/.github/workflows/release-checker.yml
+++ b/.github/workflows/release-checker.yml
@@ -47,6 +47,17 @@ jobs:
           echo "::notice::Version is up to date ($(cat version.txt | tr -d '[:space:]'))"
           exit 0
 
+      - name: Rebase PR branch on latest main
+        if: steps.latest.outputs.version != steps.current.outputs.version
+        env:
+          PR_VERSION: ${{ steps.latest.outputs.version }}
+        run: |
+          PR_BRANCH="pr/opencode-release/v${PR_VERSION}"
+          git fetch origin "${{ env.TARGET_BRANCH }}"
+          git checkout "$PR_BRANCH" 2>/dev/null || git checkout -b "$PR_BRANCH"
+          git rebase "origin/${{ env.TARGET_BRANCH }}"
+          git push origin "$PR_BRANCH" --force-with-lease
+
       - name: Bump and create PR
         if: steps.latest.outputs.version != steps.current.outputs.version
         env: