From 00000d9b85aff35714b180b2aee41411b5240123 Mon Sep 17 00:00:00 2001
From: doms9 <96013514+doms9@users.noreply.github.com>
Date: Tue, 2 Sep 2025 00:51:42 -0400
Subject: [PATCH] e

---
 .github/workflows/epg.yml  | 6 ++++++
 .github/workflows/m3u8.yml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/epg.yml b/.github/workflows/epg.yml
index 5e80740..fcb4374 100644
--- a/.github/workflows/epg.yml
+++ b/.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:
diff --git a/.github/workflows/m3u8.yml b/.github/workflows/m3u8.yml
index 5456400..7800da7 100644
--- a/.github/workflows/m3u8.yml
+++ b/.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