fix rebase command

ashton · May 16, 2024 · 8280277 · 8280277
1 parent 542ad67
commit 8280277
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/update-branches.yaml b/.github/workflows/update-branches.yaml
@@ -8,9 +8,8 @@ jobs:
       - run: git config user.name "github-actions[bot]"
       - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
       - run: git fetch --all
-      - run: git rebase osx main
       - run: git checkout osx
-      - run: git merge main
+      - run: git rebase main
       - run: git push
   update-arch-branch:
     runs-on: ubuntu-latest
@@ -19,7 +18,6 @@ jobs:
       - run: git config user.name "github-actions[bot]"
       - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
       - run: git fetch --all
-      - run: git rebase arch main
       - run: git checkout arch
-      - run: git merge main
+      - run: git rebase main
       - run: git push