fix: platform branch sync with main (#12528)

2023-11-24 17:46:33 +01:00
parent d595aa23c0
commit ed4cce1c7e
1 changed files with 1 additions and 1 deletions
@@ -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