fix rebase command

ashton · May 16, 2024 · 05bebb9 · 05bebb9
1 parent 4e1b23b
commit 05bebb9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/update-branches.yaml b/.github/workflows/update-branches.yaml
@@ -7,13 +7,17 @@ jobs:
       - uses: actions/checkout@v4
       - run: git config user.name "github-actions[bot]"
       - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-      - run: git rebase --onto osx main
+      - run: git rebase osx main
+      - run: git checkout osx
+      - run: git merge main
       - run: git push
   update-arch-branch:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - run: git config user.name "github-actions[bot]"
       - run: git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-      - run: git rebase --onto arch main
+      - run: git rebase arch main
+      - run: git checkout arch
+      - run: git merge main
       - run: git push