mirror of
https://github.com/streamyfin/streamyfin.git
synced 2025-08-20 18:37:18 +02:00
chore
This commit is contained in:
6
scripts/automerge.sh
Normal file → Executable file
6
scripts/automerge.sh
Normal file → Executable file
@@ -1,11 +1,11 @@
|
||||
#!/bin/bash
|
||||
[[ -z $(git status --porcelain) ]] &&
|
||||
git checkout main &&
|
||||
git checkout master &&
|
||||
git pull --ff-only &&
|
||||
git checkout develop &&
|
||||
git merge main &&
|
||||
git merge master &&
|
||||
git push --follow-tags &&
|
||||
git checkout main &&
|
||||
git checkout master &&
|
||||
git merge develop --ff-only &&
|
||||
git push &&
|
||||
git checkout develop ||
|
||||
|
||||
Reference in New Issue
Block a user