From 9fbe05a6a5f9bb2839f89f8c43c4b309b6ddea67 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Apr 2026 12:45:57 -0300 Subject: [PATCH] Use per-run branch name to avoid push collisions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prior run pushed automation/sku-refresh-2026-04-24 successfully but failed before opening the PR (issue-creation bug, now fixed). On the next run, main has moved, so a new commit on the same branch name has a different parent → non-fast-forward rejection. Append ${{ github.run_number }} to make the branch unique per workflow invocation. Orphan branches left behind can be cleaned up after their PRs are merged/closed. Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitea/workflows/sku-catalog-refresh.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/sku-catalog-refresh.yaml b/.gitea/workflows/sku-catalog-refresh.yaml index 7a358f2..b9715fa 100644 --- a/.gitea/workflows/sku-catalog-refresh.yaml +++ b/.gitea/workflows/sku-catalog-refresh.yaml @@ -84,7 +84,7 @@ jobs: GITEA_REPO: ${{ github.repository }} run: | DATE=$(date -u +%Y-%m-%d) - BRANCH="automation/sku-refresh-${DATE}" + BRANCH="automation/sku-refresh-${DATE}-run${{ github.run_number }}" git config user.name "sku-refresh-bot" git config user.email "sku-refresh@automation.local"