From 49cf7ef58515d63b03ed5e0f7ce3de8d8f8d4ad4 Mon Sep 17 00:00:00 2001 From: Claudia Date: Thu, 5 Mar 2026 16:57:28 +1100 Subject: [PATCH] Update .gitea/workflows/sync-from-mirror.yaml --- .gitea/workflows/sync-from-mirror.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/sync-from-mirror.yaml b/.gitea/workflows/sync-from-mirror.yaml index b9abbd9..e59e063 100644 --- a/.gitea/workflows/sync-from-mirror.yaml +++ b/.gitea/workflows/sync-from-mirror.yaml @@ -2,7 +2,7 @@ name: Auto-Sync from Mirror on: push: repository: "Pluralflux/Pluralflux" - branches: [main,develop] + branches: ["*"] workflow_dispatch: @@ -20,7 +20,10 @@ jobs: run: | git remote add upstream https://engineering.sanya.gay/PluralFlux/PluralFlux.git git fetch upstream --prune + git reset --hard origin/main - git push origin "refs/remotes/upstream/*:refs/heads/*" --force-with-lease - git merge upstream/main -m "Syncing from github" - git push origin main \ No newline at end of file + + TARGET=${{ github.ref_name }} + + git merge upstream/$TARGET -m "Syncing from github" --strategy-option ours + git push origin $TARGET \ No newline at end of file