From acd2a787bca95d226f9dcd19f734402f21002a04 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2026 21:30:44 +0200
Subject: [PATCH] fix(ci): use -B flag to reset sushi30 branch if it already
 exists

The default branch is now sushi30, so actions/checkout checks it out
and git checkout -b fails. -B creates or resets the branch.

Verified locally with a simulation script before committing.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .github/workflows/sync-rebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-rebase.yml b/.github/workflows/sync-rebase.yml
index 58e916be2..814dd7d3b 100644
--- a/.github/workflows/sync-rebase.yml
+++ b/.github/workflows/sync-rebase.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Attempt rebase of sushi30 onto main
         id: rebase
         run: |
-          git checkout -b sushi30 origin/sushi30
+          git checkout -B sushi30 origin/sushi30
           if git rebase refs/remotes/origin/main; then
             echo "status=success" >> "$GITHUB_OUTPUT"
           else