Update merger.yml

.github/workflows/merger.yml

@@ -3,7 +3,9 @@ name: Create tf/build/main Branch
 on:
   workflow_dispatch:
   push:
-
+    branches:
+      - '**'  # Spouští workflow při push událostech do všech větví
+
 jobs:
   create-tf-build-main:
     runs-on: ubuntu-latest
@@ -24,21 +26,22 @@ jobs:
       - name: Fetch all branches
         run: git fetch --all
 
-      - name: Create and update tf/build/main branch from upstream/main
+      - name: Checkout and create tf/build/main branch from upstream/main
         run: |
-          git checkout upstream/main
-          git checkout -b tf/build/main
+          git checkout -b tf/build/main upstream/main
 
       - name: Fetch and merge tf/SHT4x
         run: |
           git fetch origin tf/SHT4x:tf/SHT4x
-          git merge tf/SHT4x
+          git merge tf/SHT4x || git merge --abort
 
       - name: Fetch and merge tf/s35770
         run: |
           git fetch origin tf/s35770:tf/s35770
-          git merge tf/s35770
+          git merge tf/s35770 || git merge --abort
 
       - name: Push tf/build/main branch to origin
-        run: |
-          git push origin tf/build/main --force
+        run: git push origin tf/build/main --force
+
+      - name: Checkout back to main
+        run: git checkout main