diff --git a/scripts/merge-to-branch.sh b/scripts/merge-to-branch.sh deleted file mode 100644 index 2a0954e7..00000000 --- a/scripts/merge-to-branch.sh +++ /dev/null @@ -1,16 +0,0 @@ -set -ex - -actual_default_branch="central" - -branch=zen-"$1" -default_branch="central" - -if [ $branch = "zen-stable" ]; then - default_branch="zen-twilight" -fi - -git checkout "$branch" -git merge "$default_branch" -git push origin "$branch" - -git checkout "$actual_default_branch" \ No newline at end of file diff --git a/scripts/unify-twilight-and-stable.sh b/scripts/unify-twilight-and-stable.sh deleted file mode 100644 index 2cf10f59..00000000 --- a/scripts/unify-twilight-and-stable.sh +++ /dev/null @@ -1,14 +0,0 @@ - -# confirm before doing anything -echo "This script will merge the current branch to both the stable and twilight branches." -echo "Are you sure you want to continue? (y/n)" -read -r response -if [ "$response" != "y" ]; then - echo "Exiting." - exit 1 -fi - -set -ex - -sh $(dirname $0)/merge-to-branch.sh twilight -sh $(dirname $0)/merge-to-branch.sh stable