From b50d8a9dc1fb218bd43a19fa7e6b5327ca5bf5c3 Mon Sep 17 00:00:00 2001
From: "Amber H. Brown" <hawkowl@atleastfornow.net>
Date: Fri, 26 Jul 2019 02:26:23 +1000
Subject: [PATCH] fix merging forward

---
 .buildkite/merge_base_branch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh
index 737ef8cc75..fdccb70e3e 100755
--- a/.buildkite/merge_base_branch.sh
+++ b/.buildkite/merge_base_branch.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs-*|release-.*)$ ]]; then
+if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs-.*|release-.*)$ ]]; then
     echo "Not merging forward, as this is a release branch"
     exit 0
 fi