From ed4cce1c7e6a5b96f572fec4d3f4bbcb460db0f3 Mon Sep 17 00:00:00 2001 From: Lauris Skraucis Date: Fri, 24 Nov 2023 17:46:33 +0100 Subject: [PATCH] fix: platform branch sync with main (#12528) --- .github/workflows/sync-platform-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-platform-branch.yml b/.github/workflows/sync-platform-branch.yml index b5bc5a245c..604fb7174e 100644 --- a/.github/workflows/sync-platform-branch.yml +++ b/.github/workflows/sync-platform-branch.yml @@ -19,5 +19,5 @@ jobs: - name: Sync with main run: | git checkout platform - git pull origin main + git pull origin main --no-rebase git push origin platform