Config option to inhibit 3PID errors on /requestToken

.buildkite/merge_base_branch.sh

@@ -1,24 +1,25 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
-if [[ "$BUILDKITE_BRANCH" == "dinsic" ]]; then
+if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs|release-.*)$ ]]; then
     echo "Not merging forward, as this is a release branch"
     exit 0
 fi
 
 if [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then
-     echo "Can't figure out what the PR number is! Assuming merge target is dinsic."
+    echo "Not a pull request, or hasn't had a PR opened yet..."
 
-    # It probably hasn't had a PR opened yet. Since all PRs for dinsic land on
-    # dinsic, we can probably assume it's based on it and will be merged into
-    # it.
-    GITBASE="dinsic"
+    # It probably hasn't had a PR opened yet. Since all PRs land on develop, we
+    # can probably assume it's based on it and will be merged into it.
+    GITBASE="develop"
 else
     # Get the reference, using the GitHub API
     GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
 fi
 
+echo "--- merge_base_branch $GITBASE"
+
 # Show what we are before
 git --no-pager show -s
 
@@ -31,4 +32,4 @@ git fetch -u origin $GITBASE
 git merge --no-edit --no-commit origin/$GITBASE
 
 # Show what we are after.
-git --no-pager show -s
+git --no-pager show -s