diff --git a/.forgejo/workflows/generate-m3u.yml b/.forgejo/workflows/generate-m3u.yml index 33cf68b..e5f8bc7 100644 --- a/.forgejo/workflows/generate-m3u.yml +++ b/.forgejo/workflows/generate-m3u.yml @@ -39,6 +39,9 @@ jobs: git add . if ! git diff-index --quiet HEAD; then echo "Changes detected, committing..." + # Fetch latest changes from remote and rebase local changes on top + git pull --rebase origin main + # Get channel count for commit message CHANNELS=$(grep -c "^#EXTINF" playlist.m3u || echo "0") git commit -m "📺 Updated playlist with $CHANNELS channels - $(date '+%Y-%m-%d %H:%M')"