Ninjalama/streamyfin_mirror
1
0
Fork 1
mirror of https://github.com/streamyfin/streamyfin.git synced 2025-08-20 18:37:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge develop

Browse Source
This commit is contained in:
sarendsen
2025-02-05 09:44:03 +01:00
parent 366bc0137e 25f77645f8
commit 0fc1506b11
172 changed files with 16180 additions and 3607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/automerge.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
[[ -z $(git status --porcelain) ]] &&
git checkout master &&
git pull --ff-only &&
git checkout develop &&
git merge master &&
git push --follow-tags &&
git checkout master &&
git merge develop --ff-only &&
git push &&
git checkout develop ||
(echo "Error: Failed to merge" && exit 1)