From 1e21ce30216e625cfc338ec212d6d626e78367a9 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Fri, 15 Aug 2025 14:20:41 +0100
Subject: [PATCH] Ensure we check out the base branch, before creating the
 mergeback branch

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

diff --git a/.github/workflows/rollback-release.yml b/.github/workflows/rollback-release.yml
index 63629cb00..369f841a1 100644
--- a/.github/workflows/rollback-release.yml
+++ b/.github/workflows/rollback-release.yml
@@ -63,6 +63,9 @@ jobs:
         run: |
           set -x
 
+          # Checkout the base branch, since we may be testing on a different branch
+          git checkout "$BASE_BRANCH"
+
           # Generate a new branch name for the mergeback PR
           short_sha="${GITHUB_SHA:0:8}"
           NEW_BRANCH="mergeback/${VERSION}-to-${BASE_BRANCH}-${short_sha}"