mirror of
https://github.com/streamyfin/streamyfin.git
synced 2025-08-20 18:37:18 +02:00
12 lines
296 B
Bash
Executable File
12 lines
296 B
Bash
Executable File
#!/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) |