Update merger.yml

ThunderFly-aerospace · Aug 3, 2024 · 68e8505 · 68e8505
1 parent 65cee9d
commit 68e8505
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/merger.yml b/.github/workflows/merger.yml
@@ -33,15 +33,12 @@ jobs:
       - name: Fetch and merge tf/SHT4x
         run: |
           git fetch origin tf/SHT4x:tf/SHT4x
-          git merge tf/SHT4x || git merge --abort
+          git merge tf/SHT4x
 
       - name: Fetch and merge tf/s35770
         run: |
           git fetch origin tf/s35770:tf/s35770
-          git merge tf/s35770 || git merge --abort
-
+          git merge tf/s35770
+          
       - name: Push tf/build/main branch to origin
         run: git push origin tf/build/main --force
-
-      - name: Checkout back to main
-        run: git checkout main