alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-01-15 15:48:05 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

chore

Browse Source
This commit is contained in:
Fredrik Burmester
2025-01-06 10:14:17 +01:00
parent b243524a7d
commit 23d9cd36d1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/automerge.sh Normal file → Executable file
View File

@@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
[[ -z $(git status --porcelain) ]] && [[ -z $(git status --porcelain) ]] &&
git checkout main && git checkout master &&
git pull --ff-only && git pull --ff-only &&
git checkout develop && git checkout develop &&
git merge main && git merge master &&
git push --follow-tags && git push --follow-tags &&
git checkout main && git checkout master &&
git merge develop --ff-only && git merge develop --ff-only &&
git push && git push &&
git checkout develop || git checkout develop ||