From 22dc345cbf1e935b7bc8ca17b44a128631a8226c Mon Sep 17 00:00:00 2001 From: Claudia Date: Thu, 5 Mar 2026 16:46:05 +1100 Subject: [PATCH] Update .gitea/workflows/sync-from-mirror.yaml --- .gitea/workflows/sync-from-mirror.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/sync-from-mirror.yaml b/.gitea/workflows/sync-from-mirror.yaml index ca1fd5d..9490a9f 100644 --- a/.gitea/workflows/sync-from-mirror.yaml +++ b/.gitea/workflows/sync-from-mirror.yaml @@ -22,5 +22,6 @@ jobs: git fetch upstream --prune 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 + git checkout main + git rebase upstream/main + git push origin main --force-with-lease \ No newline at end of file