From 83c16b7c5e7ee6c91d565ae513de041bc923eec8 Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Sun, 29 Mar 2026 00:27:50 -0700 Subject: [PATCH] fix: disambiguate main branch checkout in mirror-sync git checkout main is ambiguous when both origin/main and mirror/main exist. Use -B to explicitly create from origin/main. --- .forgejo/workflows/mirror-sync.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/mirror-sync.yaml b/.forgejo/workflows/mirror-sync.yaml index cbfff0a..5089005 100644 --- a/.forgejo/workflows/mirror-sync.yaml +++ b/.forgejo/workflows/mirror-sync.yaml @@ -37,7 +37,7 @@ jobs: - name: Fast-forward main from mirror run: | - git checkout main + git checkout -B main origin/main git merge --ff-only mirror/main git push origin main