e

.github/workflows/epg.yml

@@ -38,6 +38,12 @@ jobs:
       - name: Fetch EPG
         run: uv run EPG/fetch.py
 
+      - name: Pull latest changes
+        if: steps.check_time.outputs.run == 'true'
+        run: |
+          git fetch origin default
+          git rebase origin/default || git rebase --abort
+
       - name: Push changes
         uses: stefanzweifel/git-auto-commit-action@v6
         with:

.github/workflows/m3u8.yml

@@ -65,6 +65,12 @@ jobs:
         if: steps.check_time.outputs.run == 'true'
         run: uv run M3U8/fetch.py
 
+      - name: Pull latest changes
+        if: steps.check_time.outputs.run == 'true'
+        run: |
+          git fetch origin default
+          git rebase origin/default || git rebase --abort
+
       - name: Push changes
         if: steps.check_time.outputs.run == 'true'
         uses: stefanzweifel/git-auto-commit-action@v6