back to merge instead of rebase

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