Push to staging fails unless master has been merged into current branch

script/push_to_staging.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+source ./script/includes.sh
 
 # Add staging git remote if required
 ST2_TEST=`git remote | grep -s 'staging2' || true`
@@ -8,6 +9,9 @@ if [[ "$ST2_TEST" != *staging2* ]]; then
     git remote add staging2 openfoodweb@ofn-staging2:apps/openfoodweb/current
 fi
 
+echo "--- Verifying branch is based on current master"
+exit_unless_master_merged
+
 echo "--- Loading baseline data"
 ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/load_staging_baseline.sh"